diff options
Diffstat (limited to 'ffmpeg/libavcodec/mpegvideo_parser.c')
| -rw-r--r-- | ffmpeg/libavcodec/mpegvideo_parser.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/ffmpeg/libavcodec/mpegvideo_parser.c b/ffmpeg/libavcodec/mpegvideo_parser.c index 35a9160..7aa3660 100644 --- a/ffmpeg/libavcodec/mpegvideo_parser.c +++ b/ffmpeg/libavcodec/mpegvideo_parser.c @@ -21,7 +21,8 @@ */ #include "parser.h" -#include "mpegvideo.h" +#include "mpeg12.h" +#include "internal.h" struct MpvParseContext { ParseContext pc; @@ -50,7 +51,7 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, while (buf < buf_end) { start_code= -1; - buf= avpriv_mpv_find_start_code(buf, buf_end, &start_code); + buf= avpriv_find_start_code(buf, buf_end, &start_code); bytes_left = buf_end - buf; switch(start_code) { case PICTURE_START_CODE: @@ -65,7 +66,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); + ff_set_dimensions(avctx, pc->width, pc->height); did_set_size=1; } frame_rate_index = buf[3] & 0xf; @@ -93,7 +94,7 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, pc->height |=( vert_size_ext << 12); bit_rate = (bit_rate&0x3FFFF) | (bit_rate_ext << 18); if(did_set_size) - avcodec_set_dimensions(avctx, pc->width, pc->height); + ff_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 = AV_CODEC_ID_MPEG2VIDEO; @@ -117,6 +118,14 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, s->repeat_pict = 2; } } + + if (!pc->progressive_sequence) { + if (top_field_first) + s->field_order = AV_FIELD_TT; + else + s->field_order = AV_FIELD_BB; + } else + s->field_order = AV_FIELD_PROGRESSIVE; } break; } |