[FFmpeg-cvslog] Merge commit '598ce4ab4f1893e0661fc038101487e511937877'
Michael Niedermayer
git at videolan.org
Thu Dec 12 00:32:50 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 12 00:25:31 2013 +0100| [e3578fd525e94bfec16de1dfd0e5a49f18a0e0fd] | committer: Michael Niedermayer
Merge commit '598ce4ab4f1893e0661fc038101487e511937877'
* commit '598ce4ab4f1893e0661fc038101487e511937877':
h264: call av_frame_unref() instead of avcodec_get_frame_defaults().
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e3578fd525e94bfec16de1dfd0e5a49f18a0e0fd
---
More information about the ffmpeg-cvslog
mailing list