[FFmpeg-cvslog] Merge commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a'
Michael Niedermayer
git at videolan.org
Mon Apr 7 04:04:56 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 7 03:36:48 2014 +0200| [0ecb3075c1c243cfb656d1cbe0b19cdb91bde659] | committer: Michael Niedermayer
Merge commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a'
* commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a':
h264: Refactor decode_nal_units
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ecb3075c1c243cfb656d1cbe0b19cdb91bde659
---
More information about the ffmpeg-cvslog
mailing list