[FFmpeg-cvslog] Merge commit '2df0776c2293efb0ac12c003843ce19332342e01'
Michael Niedermayer
git at videolan.org
Wed Aug 14 11:51:06 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 14 11:41:58 2013 +0200| [8da4305eb520bb4624df633ef124089fcfba8e6d] | committer: Michael Niedermayer
Merge commit '2df0776c2293efb0ac12c003843ce19332342e01'
* commit '2df0776c2293efb0ac12c003843ce19332342e01':
nuv: Use av_fast_realloc
Conflicts:
libavcodec/nuv.c
This change is not merged, the long ago fixed buffer use after codec_reinit()
was a bug.
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8da4305eb520bb4624df633ef124089fcfba8e6d
---
More information about the ffmpeg-cvslog
mailing list