diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-11 23:40:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-11 23:41:27 +0100 |
| commit | 27e79779821ed0cca312e1d38ac3b1d38999b6ef (patch) | |
| tree | 9f1f490064d46954665728bdefbfbf1eb58d8a41 /libavcodec | |
| parent | e22e943ef90e5698df128ed245a530d4b97dc317 (diff) | |
| parent | 95a8a5aca60ce37d3abdf121a0285c2e317cf521 (diff) | |
Merge commit '95a8a5aca60ce37d3abdf121a0285c2e317cf521'
* commit '95a8a5aca60ce37d3abdf121a0285c2e317cf521':
lavc: call av_frame_unref() instead of avcodec_get_frame_defaults().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index fb6fa9234a..020c3434b4 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2088,7 +2088,7 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi if ((avctx->coded_width || avctx->coded_height) && av_image_check_size(avctx->coded_width, avctx->coded_height, 0, avctx)) return AVERROR(EINVAL); - avcodec_get_frame_defaults(picture); + av_frame_unref(picture); if ((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size || (avctx->active_thread_type & FF_THREAD_FRAME)) { int did_split = av_packet_split_side_data(&tmp); @@ -2226,7 +2226,7 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx, return AVERROR(EINVAL); } - avcodec_get_frame_defaults(frame); + av_frame_unref(frame); if ((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size || (avctx->active_thread_type & FF_THREAD_FRAME)) { uint8_t *side; |