[FFmpeg-cvslog] Merge commit '9a026c72982faf20e1c8dfbe48f0b312cdea69c8'
Michael Niedermayer
git at videolan.org
Mon Jan 6 16:23:58 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 6 16:15:03 2014 +0100| [7ee8a1c562e8de3bf9627ff10bfb744392c018b7] | committer: Michael Niedermayer
Merge commit '9a026c72982faf20e1c8dfbe48f0b312cdea69c8'
* commit '9a026c72982faf20e1c8dfbe48f0b312cdea69c8':
h264: rebuild the default ref list if the reference count changes
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ee8a1c562e8de3bf9627ff10bfb744392c018b7
---
More information about the ffmpeg-cvslog
mailing list