[FFmpeg-cvslog] Merge commit '73e8fab31dc19c4371499e612856accbc00b2820'
Michael Niedermayer
git at videolan.org
Fri Feb 14 13:45:23 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 14 13:35:45 2014 +0100| [60b46a00c62db3e366322f99d261480cd213bfa5] | committer: Michael Niedermayer
Merge commit '73e8fab31dc19c4371499e612856accbc00b2820'
* commit '73e8fab31dc19c4371499e612856accbc00b2820':
h264: print values in case of error
Conflicts:
libavcodec/h264.c
libavcodec/h264_ps.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=60b46a00c62db3e366322f99d261480cd213bfa5
---
More information about the ffmpeg-cvslog
mailing list