[FFmpeg-cvslog] Merge commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672'
Michael Niedermayer
git at videolan.org
Mon Mar 17 05:41:57 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 17 04:59:21 2014 +0100| [533bc4c0a30db6a6a4b75bb1094ad2e25f11ae51] | committer: Michael Niedermayer
Merge commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672'
* commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672':
er: move relevant fields from Picture to ERPicture
Conflicts:
libavcodec/error_resilience.c
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=533bc4c0a30db6a6a4b75bb1094ad2e25f11ae51
---
More information about the ffmpeg-cvslog
mailing list