1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-20 07:48:15 +02:00
FFmpeg/libavcodec
Michael Niedermayer e3fb8ac956 Merge commit '7520d9779c6d30b385df5a0a42da508238076192'
* commit '7520d9779c6d30b385df5a0a42da508238076192':
  mjpeg: Move code out of else branch

Conflicts:
	libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-30 13:50:55 +02:00
..
2013-06-30 01:35:22 +02:00
2013-06-13 21:49:18 +00:00
2013-06-12 16:23:49 +02:00
2013-06-13 21:49:18 +00:00
2013-06-13 21:49:18 +00:00
2013-06-21 03:22:02 +02:00