diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 00:25:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 00:25:31 +0100 |
| commit | e3578fd525e94bfec16de1dfd0e5a49f18a0e0fd (patch) | |
| tree | 64be727821a3d423a5d5233a2b1905c7add49efb /libavcodec/utils.c | |
| parent | 525a7d9b78683ce0e44a97283eb7ed23d36ae688 (diff) | |
| parent | 598ce4ab4f1893e0661fc038101487e511937877 (diff) | |
| download | ffmpeg-e3578fd525e94bfec16de1dfd0e5a49f18a0e0fd.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
0 files changed, 0 insertions, 0 deletions