diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 17:48:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 17:48:24 +0100 |
| commit | f3acdd44bf37557574dea2c2c6d9771642e9ebbc (patch) | |
| tree | ece8ce0c42a2aa296242a940f1d216531a384d14 /libavcodec/assenc.c | |
| parent | 04dac5d1e00846610e65b928b2461eba39425613 (diff) | |
| parent | a1ee1648690726b34e98eaf8db04fd7b3303cfc8 (diff) | |
| download | ffmpeg-f3acdd44bf37557574dea2c2c6d9771642e9ebbc.tar.gz | |
Merge commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8'
* commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8':
lavc/decode_video(): always unref the frame if there is no output in decode_video
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/assenc.c')
0 files changed, 0 insertions, 0 deletions