[FFmpeg-cvslog] Merge commit '6d78e852fbf3cab438a2085bcb64b90457c4a851'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 17 15:51:13 2014 +0100| [ba7cdb970f1cb49ae7a99948dae6b88d163545fe] | committer: Michael Niedermayer

Merge commit '6d78e852fbf3cab438a2085bcb64b90457c4a851'

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

Conflicts:
	libavformat/img2enc.c

See: e8df18270a50fd57eab06f1718ad9d075b200d98
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba7cdb970f1cb49ae7a99948dae6b88d163545fe
---