From: <sl...@ke...> - 2007-12-15 11:48:59
|
CVS Root: /cvs/gstreamer Module: gst-ffmpeg Changes by: slomo Date: Sat Dec 15 2007 11:49:04 UTC Branch: GST_FFMPEG_NO_MIRROR Log message: Based on a patch by: Hans de Goede <j dot w dot r degoede at hhs dot nl> * ext/ffmpeg/gstffmpegcfg.c: (gst_ffmpeg_pre_me_get_type), (gst_ffmpeg_pred_method_get_type): NULL-terminate the GEnumValue arrays, otherwise they will cause crashes. Fixes #503733. Modified files: . : ChangeLog ext/ffmpeg : gstffmpegcfg.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ChangeLog.diff?r1=1.413.2.5&r2=1.413.2.6 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcfg.c.diff?r1=1.7&r2=1.7.2.1 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-ffmpeg/ChangeLog,v retrieving revision 1.413.2.5 retrieving revision 1.413.2.6 diff -u -d -r1.413.2.5 -r1.413.2.6 --- ChangeLog 9 Dec 2007 04:31:01 -0000 1.413.2.5 +++ ChangeLog 15 Dec 2007 11:48:49 -0000 1.413.2.6 @@ -1,3 +1,13 @@ +2007-12-15 Sebastian Dröge <sl...@ci...> + + Based on a patch by: + Hans de Goede <j dot w dot r degoede at hhs dot nl> + * ext/ffmpeg/gstffmpegcfg.c: (gst_ffmpeg_pre_me_get_type), + (gst_ffmpeg_pred_method_get_type): + NULL-terminate the GEnumValue arrays, otherwise they will cause + crashes. Fixes #503733. 2007-12-09 Sebastian Dröge <sl...@ci...> * configure.ac: Index: gstffmpegcfg.c RCS file: /cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegcfg.c,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -d -r1.7 -r1.7.2.1 --- gstffmpegcfg.c 3 Nov 2007 16:14:52 -0000 1.7 +++ gstffmpegcfg.c 15 Dec 2007 11:48:50 -0000 1.7.2.1 @@ -87,7 +87,7 @@ static const GEnumValue ffmpeg_mb_decisions[] = { {FF_MB_DECISION_SIMPLE, "Use method set by mb-cmp", "simple"}, {FF_MB_DECISION_BITS, - "Chooses the one which needs the fewest bits aka vhq mode", "bits"}, + "Chooses the one which needs the fewest bits aka vhq mode", "bits"}, {FF_MB_DECISION_RD, "Rate Distortion", "rd"}, {0, NULL, NULL}, }; @@ -223,6 +223,7 @@ {0, "Disabled", "off"}, {1, "Only after I-frames", "key"}, {2, "Always", "all"}, + {0, NULL, NULL} ffmpeg_pre_me_type = @@ -243,6 +244,7 @@ {FF_PRED_LEFT, "Left", "left"}, {FF_PRED_PLANE, "Plane", "plane"}, {FF_PRED_MEDIAN, "Median", "median"}, ffmpeg_pred_method = @@ -265,22 +267,22 @@ {CODEC_FLAG_GMC, "GMC", "gmc"}, {CODEC_FLAG_MV0, "Always try a MB with MV (0,0)", "mv0"}, {CODEC_FLAG_PART, - "Store MV, DC and AC coefficients in seperate partitions", "part"}, + "Store MV, DC and AC coefficients in seperate partitions", "part"}, {CODEC_FLAG_GRAY, "Only decode/encode grayscale", "gray"}, {CODEC_FLAG_NORMALIZE_AQP, - "Normalize Adaptive Quantization (masking, etc)", "aqp"}, + "Normalize Adaptive Quantization (masking, etc)", "aqp"}, {CODEC_FLAG_TRELLIS_QUANT, "Trellis Quantization", "trellis"}, {CODEC_FLAG_GLOBAL_HEADER, "Global headers in extradata instead of every keyframe", - "global-headers"}, + "global-headers"}, {CODEC_FLAG_AC_PRED, "H263 Advanced Intra Coding / MPEG4 AC prediction", - "aic"}, + "aic"}, {CODEC_FLAG_H263P_UMV, "Unlimited Motion Vector", "umv"}, {CODEC_FLAG_CBP_RD, "Rate Distoration Optimization for CBP", "cbp-rd"}, {CODEC_FLAG_QP_RD, "Rate Distoration Optimization for QP selection", - "qp-rd"}, + "qp-rd"}, {CODEC_FLAG_SVCD_SCAN_OFFSET, - "Reserve space for SVCD scan offset user data", "scanoffset"}, + "Reserve space for SVCD scan offset user data", "scanoffset"}, {CODEC_FLAG_CLOSED_GOP, "Closed GOP", "closedgop"}, |