virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-29 05:57:37 +02:00
Code Issues Releases Activity
Files
a46a23d30fea9c8a5570e07ec4d9c9b4eaa6eb4f
FFmpeg/libavcodec/mjpegdec.c
Michael Niedermayer 6c68522a2a Merge commit '809c3023b699c54c90511913d3b6140dd2436550' 
* commit '809c3023b699c54c90511913d3b6140dd2436550':
  mjpegdec: check for pixel format changes

Conflicts:
	libavcodec/mjpegdec.c

See: 5c378d6a6d
See: a2f680c7bc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 12:49:23 +01:00

83 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink