[FFmpeg-cvslog] Merge commit 'e3f50f247155216229e34f165bae8c329d5a001e'
Michael Niedermayer
git at videolan.org
Thu Nov 13 13:04:20 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 13 12:54:52 2014 +0100| [7f8ef7876efe99e7e9d0e41b0a56530877536496] | committer: Michael Niedermayer
Merge commit 'e3f50f247155216229e34f165bae8c329d5a001e'
* commit 'e3f50f247155216229e34f165bae8c329d5a001e':
dnxhdenc: check negative index
Conflicts:
libavcodec/dnxhdenc.c
Not merged, the cid index thats taken out of our table will be found again in
said table.
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f8ef7876efe99e7e9d0e41b0a56530877536496
---
More information about the ffmpeg-cvslog
mailing list