From eff0fefa3ec3111031a87bcf945fa49cf210df35 Mon Sep 17 00:00:00 2001 From: Yves Lefebvre Date: Thu, 12 Apr 2007 10:56:42 +0000 Subject: [PATCH] ext/ffmpeg/gstffmpegdec.c: Draw edges for h264. Fixes #364139. Original commit message from CVS: Patch by: Yves Lefebvre * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_setcaps): Draw edges for h264. Fixes #364139. Set the error resilience flag just in case... --- ChangeLog | 8 ++++++++ common | 2 +- ext/ffmpeg/gstffmpegdec.c | 8 ++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fdde41f..76986a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-04-12 Wim Taymans + + Patch by: Yves Lefebvre + + * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_setcaps): + Draw edges for h264. Fixes #364139. + Set the error resilience flag just in case... + 2007-03-17 Johan Dahlin * ext/ffmpeg/gstffmpegcodecmap.c (gst_ffmpeg_get_codecid_longname): diff --git a/common b/common index dec151d..9097e25 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit dec151d15512e4cca2dcdd36d9c6c4a2185760ec +Subproject commit 9097e252e477e18182f08a032d8860bdee9a0416 diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index a6b6dec..6ea54b0 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -605,12 +605,16 @@ gst_ffmpegdec_setcaps (GstPad * pad, GstCaps * caps) GST_DEBUG_OBJECT (ffmpegdec, "Using framerate from codec"); } - /* do *not* draw edges */ - ffmpegdec->context->flags |= CODEC_FLAG_EMU_EDGE; + if(oclass->in_plugin->id != CODEC_ID_H264) { + /* do *not* draw edges */ + ffmpegdec->context->flags |= CODEC_FLAG_EMU_EDGE; + } /* workaround encoder bugs */ ffmpegdec->context->workaround_bugs |= FF_BUG_AUTODETECT; + ffmpegdec->context->error_resilience = 1; + /* for slow cpus */ ffmpegdec->context->lowres = ffmpegdec->lowres; ffmpegdec->context->hurry_up = ffmpegdec->hurry_up; -- 2.7.4