From 221ff7e4822f60e9dead81c57f0794d03bb0b5c5 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 22 Jan 2008 13:54:34 +0000 Subject: [PATCH] ext/ffmpeg/gstffmpegcfg.c: Add h263 to the list of codecs using the mpeg flags and options. Original commit message from CVS: * ext/ffmpeg/gstffmpegcfg.c: (gst_ffmpeg_flags_get_type): Add h263 to the list of codecs using the mpeg flags and options. Add some more H263 specific flags. Fixes #421068. --- ChangeLog | 6 ++++++ ext/ffmpeg/gstffmpegcfg.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 680e6f55b4..93f3d57dda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-01-22 Wim Taymans + + * ext/ffmpeg/gstffmpegcfg.c: (gst_ffmpeg_flags_get_type): + Add h263 to the list of codecs using the mpeg flags and options. + Add some more H263 specific flags. Fixes #421068. + 2008-01-22 Sebastian Dröge * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register): diff --git a/ext/ffmpeg/gstffmpegcfg.c b/ext/ffmpeg/gstffmpegcfg.c index 37cf84910e..32399c2bc5 100644 --- a/ext/ffmpeg/gstffmpegcfg.c +++ b/ext/ffmpeg/gstffmpegcfg.c @@ -263,6 +263,7 @@ gst_ffmpeg_flags_get_type (void) if (!ffmpeg_flags_type) { static const GFlagsValue ffmpeg_flags[] = { {CODEC_FLAG_4MV, "Allow 4 MV per MB", "4mv"}, + {CODEC_FLAG_H263P_AIV, "H.263 alternative inter VLC", "aiv"}, {CODEC_FLAG_QPEL, "Quartel Pel Motion Compensation", "qpel"}, {CODEC_FLAG_GMC, "GMC", "gmc"}, {CODEC_FLAG_MV0, "Always try a MB with MV (0,0)", "mv0"}, @@ -281,6 +282,7 @@ gst_ffmpeg_flags_get_type (void) {CODEC_FLAG_CBP_RD, "Rate Distoration Optimization for CBP", "cbp-rd"}, {CODEC_FLAG_QP_RD, "Rate Distoration Optimization for QP selection", "qp-rd"}, + {CODEC_FLAG_H263P_SLICE_STRUCT, "H263 slice struct", "ss"}, {CODEC_FLAG_SVCD_SCAN_OFFSET, "Reserve space for SVCD scan offset user data", "scanoffset"}, {CODEC_FLAG_CLOSED_GOP, "Closed GOP", "closedgop"}, @@ -359,6 +361,7 @@ static gint mpeg[] = { CODEC_ID_MSMPEG4V3, CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO, + CODEC_ID_H263P, CODEC_ID_FLV1, CODEC_ID_NONE };