diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-20 03:25:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-21 02:31:27 +0200 |
| commit | 94eadee7efc2c5d19ecfe92d36f0556663468080 (patch) | |
| tree | cc6a7f94e04be1f2d92bc7e9af6eeea0a0646b5f /libavcodec/utils.c | |
| parent | 007f773942e5c8f39e9ad880d8e7e71f8f3bf7d2 (diff) | |
| download | ffmpeg-streaming-94eadee7efc2c5d19ecfe92d36f0556663468080.zip ffmpeg-streaming-94eadee7efc2c5d19ecfe92d36f0556663468080.tar.gz | |
Merge/split side data.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -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 b61f9b7..aecfb8a 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -733,9 +733,9 @@ 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 -1; - avctx->pkt = avpkt; - if((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size || (avctx->active_thread_type&FF_THREAD_FRAME)){ + av_packet_split_side_data(avpkt); + avctx->pkt = avpkt; if (HAVE_PTHREADS && avctx->active_thread_type&FF_THREAD_FRAME) ret = ff_thread_decode_frame(avctx, picture, got_picture_ptr, avpkt); |
