diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 14:26:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 14:26:13 +0200 |
| commit | d0ab71ed11c54c40b1c975c713dee8d3993ccdc5 (patch) | |
| tree | d0849ac53365bcac864997d67825435cd907740b /libavcodec/utils.c | |
| parent | 719fde47ca641edd4321f384579438f930bc50eb (diff) | |
| parent | 292a08cbab3392a693b1c3b03a9cac6a1b65d304 (diff) | |
| download | ffmpeg-d0ab71ed11c54c40b1c975c713dee8d3993ccdc5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
asfdec: cosmetics, reformat ff_asf_parse_packet()
g.723.1: add missing CODEC_CAP_DR1
avconv: remove now unneeded calls to avcodec_get_frame_defaults().
lavc: initialize output AVFrame before decoding.
Conflicts:
libavformat/asfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 8e7dc0f869..d7c3ecbf11 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1643,6 +1643,8 @@ 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); + 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); apply_param_change(avctx, &tmp); @@ -1759,6 +1761,8 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx, return AVERROR(EINVAL); } + avcodec_get_frame_defaults(frame); + if ((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size) { uint8_t *side; int side_size; |