[FFmpeg-cvslog] Merge commit '2e708f17083fc41f10161f2406d57ec154c75468'
Michael Niedermayer
git at videolan.org
Fri Mar 14 12:00:10 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 11:52:28 2014 +0100| [0c402810faf64ea3b62601e94d3dcb0cbbdcee5e] | committer: Michael Niedermayer
Merge commit '2e708f17083fc41f10161f2406d57ec154c75468'
* commit '2e708f17083fc41f10161f2406d57ec154c75468':
ljpeg: fix duplicated pixel format entry
Conflicts:
libavcodec/ljpegenc.c
No change as there was no duplicate entry in ffmpeg
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0c402810faf64ea3b62601e94d3dcb0cbbdcee5e
---
More information about the ffmpeg-cvslog
mailing list