[FFmpeg-cvslog] Merge commit '809c3023b699c54c90511913d3b6140dd2436550'

Michael Niedermayer git at videolan.org
Fri Dec 19 12:56:04 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 19 12:45:56 2014 +0100| [6c68522a2aa8c3fc664482ab8a18c991039c78aa] | committer: Michael Niedermayer

Merge commit '809c3023b699c54c90511913d3b6140dd2436550'

* commit '809c3023b699c54c90511913d3b6140dd2436550':
  mjpegdec: check for pixel format changes

Conflicts:
	libavcodec/mjpegdec.c

See: 5c378d6a6df8243f06c87962b873bd563e58cd39
See: a2f680c7bc7642c687aeb4e14d00ac74833c7a09
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list