ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu Nov 6
18:27:58 2014 +0100| [c53a1507aa097ad4793c0d4f840da09dba6ffbaf] | committer:
Michael Niedermayer
Merge commit '199d9f995da53fe2507821f6d96bbc692574e1a9'
* commit '199d9f995da53fe2507821f6d96bbc692574e1a9':
mjpegdec: fix undefined shift
Conflicts:
libavcodec/mjpegdec.c
See: b4329605289e25bb071ec1c1182bf25fc83b09aa
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c53a1507aa097ad4793c0d4f840da09dba6ffbaf
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
