diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 16:13:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 16:13:42 +0100 |
| commit | 04dac5d1e00846610e65b928b2461eba39425613 (patch) | |
| tree | 1cafac12bdeda3647e11c4eaa8c1626de88bf221 | |
| parent | f4332e959161ef7a58564104e092148ef7409d7d (diff) | |
| parent | 85f947aefb3dae81f65f518acdffa8e31c679654 (diff) | |
| download | ffmpeg-04dac5d1e00846610e65b928b2461eba39425613.tar.gz | |
Merge commit '85f947aefb3dae81f65f518acdffa8e31c679654'
* commit '85f947aefb3dae81f65f518acdffa8e31c679654':
lavc: remove a pointless check in decode_audio4()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index a93b2bdff2..3c9f1243b2 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2299,7 +2299,7 @@ fail: frame->extended_buf = NULL; frame->nb_extended_buf = 0; } - } else if (frame->data[0]) + } else av_frame_unref(frame); } |