diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-24 05:19:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-24 05:19:56 +0200 |
| commit | af2f79709947e5135e2923138a15ba83daeb75c5 (patch) | |
| tree | d5857b09cbe1af6a88e77c94cd8ef98a9c6a907a | |
| parent | 0781e14ec440463529c5cae25f7335a7224d7f26 (diff) | |
| download | ffmpeg-af2f79709947e5135e2923138a15ba83daeb75c5.tar.gz | |
partial revert of 01d3ebaf219d83c0a70cdf9696ecb6b868e8a165
Fixes ffplay
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 9dcc4a8105..5354459866 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -746,6 +746,8 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi if(!avctx->has_b_frames){ picture->pkt_pos= avpkt->pos; + } + //FIXME these should be under if(!avctx->has_b_frames) if (!picture->sample_aspect_ratio.num) picture->sample_aspect_ratio = avctx->sample_aspect_ratio; if (!picture->width) @@ -754,7 +756,6 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi picture->height = avctx->height; if (picture->format == PIX_FMT_NONE) picture->format = avctx->pix_fmt; - } } emms_c(); //needed to avoid an emms_c() call before every return; |