updated ffmpeg

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

1 files changed, 8 insertions, 8 deletions

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12.c
index f39a34ebf..ecbb62c89 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12.c
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mpeg12.c
@@ -21,7 +21,7 @@
  */

 

 /**

- * @file libavcodec/mpeg12.c

+ * @file

  * MPEG-1/2 decoder

  */

 

@@ -1440,7 +1440,7 @@ static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1)
     w= get_bits(&s->gb, 14);

     skip_bits(&s->gb, 1); //marker

     h= get_bits(&s->gb, 14);

-    skip_bits(&s->gb, 1); //marker

+    // remaining 3 bits are zero padding

 

     s1->pan_scan.width= 16*w;

     s1->pan_scan.height=16*h;

@@ -1926,7 +1926,7 @@ static int slice_decode_thread(AVCodecContext *c, void *arg){
 }

 

 /**

- * Handles slice ends.

+ * Handle slice ends.

  * @return 1 if it seems to be the last slice

  */

 static int slice_end(AVCodecContext *avctx, AVFrame *pict)

@@ -2159,7 +2159,7 @@ static void mpeg_decode_gop(AVCodecContext *avctx,
             time_code_pictures, s->closed_gop, broken_link);

 }

 /**

- * Finds the end of the current frame in the bitstream.

+ * Find the end of the current frame in the bitstream.

  * @return the position of the first byte of the next frame, or -1

  */

 int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size, AVCodecParserContext *s, int64_t *rtStart, AVCodecContext *avctx) /* rtStart,avctx: ffdshow custom code */

@@ -2194,7 +2194,7 @@ int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size,
             if(pc->frame_start_found==0 && state >= SLICE_MIN_START_CODE && state <= SLICE_MAX_START_CODE){

                 i++;

                 pc->frame_start_found=4;

-                

+

                 pc->rtStart=*rtStart; /* ffdshow custom code */

                 *rtStart=_I64_MIN;    /* ffdshow custom code */

             }

@@ -2509,7 +2509,7 @@ static int mpeg_decode_end(AVCodecContext *avctx)
 

 AVCodec mpeg1video_decoder = {

     "mpeg1video",

-    CODEC_TYPE_VIDEO,

+    AVMEDIA_TYPE_VIDEO,

     CODEC_ID_MPEG1VIDEO,

     sizeof(Mpeg1Context),

     /*.init=*/mpeg_decode_init,

@@ -2526,7 +2526,7 @@ AVCodec mpeg1video_decoder = {
 

 AVCodec mpeg2video_decoder = {

     "mpeg2video",

-    CODEC_TYPE_VIDEO,

+    AVMEDIA_TYPE_VIDEO,

     CODEC_ID_MPEG2VIDEO,

     sizeof(Mpeg1Context),

     /*.init=*/mpeg_decode_init,

@@ -2546,7 +2546,7 @@ AVCodec mpeg2video_decoder = {
 //legacy decoder

 AVCodec mpegvideo_decoder = {

     "mpegvideo",

-    CODEC_TYPE_VIDEO,

+    AVMEDIA_TYPE_VIDEO,

     CODEC_ID_MPEG2VIDEO,

     sizeof(Mpeg1Context),

     /*.init=*/mpeg_decode_init,