[FFmpeg-cvslog] partial revert of 01d3ebaf219d83c0a70cdf9696ecb6b868e8a165

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 24 05:19:56 2011 +0200| [af2f79709947e5135e2923138a15ba83daeb75c5] | committer: Michael Niedermayer

partial revert of 01d3ebaf219d83c0a70cdf9696ecb6b868e8a165

Fixes ffplay

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af2f79709947e5135e2923138a15ba83daeb75c5
---

 libavcodec/utils.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 9dcc4a8..5354459 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;