falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit '6d78e852fbf3cab438a2085bcb64b90457c4a851' 

* commit '6d78e852fbf3cab438a2085bcb64b90457c4a851':
  img2: add j2c file extension

Conflicts:
	libavformat/img2enc.c

See: e8df18270a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.3
Michael Niedermayer 12 years ago
parent
c738ffcf2c 6d78e852fb
commit
ba7cdb970f
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available