updated ffmpeg

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1987 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 13 insertions, 7 deletions

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c
index defe2d29c..9952f838e 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c
@@ -840,13 +840,6 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx){
     if(!avctx->has_b_frames)

     s->low_delay= 1;

 

-    /* ffdshow custom code (begin) */

-    if(avctx->codec_id == CODEC_ID_SVQ3)

-        avctx->pix_fmt= PIX_FMT_YUVJ420P;

-    else

-        avctx->pix_fmt= PIX_FMT_YUV420P;

-    /* ffdshow custom code (end) */

-

     avctx->chroma_sample_location = AVCHROMA_LOC_LEFT;

 

     ff_h264_decode_init_vlc();

@@ -1763,6 +1756,19 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
             av_reduce(&s->avctx->time_base.num, &s->avctx->time_base.den,

                       h->sps.num_units_in_tick * 2, den, 1<<30);

         }

+        

+        /* ffdshow custom code (begin) */

+        if(s->avctx->codec_id == CODEC_ID_SVQ3) {

+            s->avctx->pix_fmt = PIX_FMT_YUVJ420P;

+        } else {

+            // todo: adjust colorspace handling in ffdshow?

+            //if(s->avctx->color_range == AVCOL_RANGE_JPEG) {

+            //    s->avctx->pix_fmt = PIX_FMT_YUVJ420P;

+            //} else {

+                s->avctx->pix_fmt = PIX_FMT_YUV420P;

+            //}

+        }

+        /* ffdshow custom code (end) */

 

         if (MPV_common_init(s) < 0)

             return -1;