ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Mar 30
21:05:23 2015 +0200| [794e9fb5a649b4489e7369eb846049d4a03f3ff9] | committer:
Michael Niedermayer
Merge commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80'
* commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80':
mjpeg: Move code only used in the encoder(s) to the appropriate header
Conflicts:
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=794e9fb5a649b4489e7369eb846049d4a03f3ff9
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
