ffmpeg | branch: master | Michael Niedermayer <michae...@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 <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed8de1570db856ba830c3e4b19b5628ab24a8853
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
