Deprecate av_opt_show() in favor of a new function av_opt_show2(),

[ffmpeg] / libavcodec / mpegvideo_parser.c

diff --git a/libavcodec/mpegvideo_parser.c b/libavcodec/mpegvideo_parser.c
index 537614bc5b53d97cc3278a2f6531c56994ea3edb..546c3bdad7391df02a99773f5a85d5b26b81d2ac 100644 (file)
--- a/libavcodec/mpegvideo_parser.c
+++ b/libavcodec/mpegvideo_parser.c
@@ -28,7 +28,7 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s,
                                       const uint8_t *buf, int buf_size)
 {
     ParseContext1 *pc = s->priv_data;
-    const uint8_t *buf_end;
+    const uint8_t *buf_end = buf + buf_size;
     uint32_t start_code;
     int frame_rate_index, ext_type, bytes_left;
     int frame_rate_ext_n, frame_rate_ext_d;
@@ -37,7 +37,7 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s,
     int did_set_size=0;
 //FIXME replace the crap with get_bits()
     s->repeat_pict = 0;
-    buf_end = buf + buf_size;
+
     while (buf < buf_end) {
         start_code= -1;
         buf= ff_find_start_code(buf, buf_end, &start_code);
@@ -53,7 +53,7 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s,
                 pc->width  = (buf[0] << 4) | (buf[1] >> 4);
                 pc->height = ((buf[1] & 0x0f) << 8) | buf[2];
                 if(!avctx->width || !avctx->height || !avctx->coded_width || !avctx->coded_height){
-                avcodec_set_dimensions(avctx, pc->width, pc->height);
+                    avcodec_set_dimensions(avctx, pc->width, pc->height);
                     did_set_size=1;
                 }
                 frame_rate_index = buf[3] & 0xf;
@@ -82,7 +82,7 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s,
                         pc->height |=( vert_size_ext << 12);
                         avctx->bit_rate += (bit_rate_ext << 18) * 400;
                         if(did_set_size)
-                        avcodec_set_dimensions(avctx, pc->width, pc->height);
+                            avcodec_set_dimensions(avctx, pc->width, pc->height);
                         avctx->time_base.den = pc->frame_rate.den * (frame_rate_ext_n + 1) * 2;
                         avctx->time_base.num = pc->frame_rate.num * (frame_rate_ext_d + 1);
                         avctx->codec_id = CODEC_ID_MPEG2VIDEO;
@@ -182,4 +182,5 @@ AVCodecParser mpegvideo_parser = {
     NULL,
     mpegvideo_parse,
     ff_parse1_close,
+    mpegvideo_split,
 };