virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

partial revert of 01d3ebaf21

Browse Source 
Fixes ffplay

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2011-05-24 05:19:56 +02:00
parent 0781e14ec4
commit af2f797099
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/utils.c
View File

@@ -746,6 +746,8 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi
if(!avctx->has_b_frames){ if(!avctx->has_b_frames){
picture->pkt_pos= avpkt->pos; picture->pkt_pos= avpkt->pos;
}
//FIXME these should be under if(!avctx->has_b_frames)
if (!picture->sample_aspect_ratio.num) if (!picture->sample_aspect_ratio.num)
picture->sample_aspect_ratio = avctx->sample_aspect_ratio; picture->sample_aspect_ratio = avctx->sample_aspect_ratio;
if (!picture->width) if (!picture->width)
@@ -754,7 +756,6 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi
picture->height = avctx->height; picture->height = avctx->height;
if (picture->format == PIX_FMT_NONE) if (picture->format == PIX_FMT_NONE)
picture->format = avctx->pix_fmt; picture->format = avctx->pix_fmt;
}
} }
emms_c(); //needed to avoid an emms_c() call before every return; emms_c(); //needed to avoid an emms_c() call before every return;