[FFmpeg-cvslog] Merge commit 'f9f883af4fe615a832407a657752e248a96c6280'
Michael Niedermayer
git at videolan.org
Tue Jan 27 13:02:39 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 27 12:55:21 2015 +0100| [ed8de1570db856ba830c3e4b19b5628ab24a8853] | committer: Michael Niedermayer
Merge commit 'f9f883af4fe615a832407a657752e248a96c6280'
* commit 'f9f883af4fe615a832407a657752e248a96c6280':
h264: simplify code in flush_dpb()
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed8de1570db856ba830c3e4b19b5628ab24a8853
---
More information about the ffmpeg-cvslog
mailing list