From 2ece5bf3ec8b08e7f43ad66fc6a2e07acf57014d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 26 Mar 2013 15:34:47 +0200 Subject: [PATCH 1/2] configure: Remove a stray msmpeg4v1 encoder declaration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No such encoder exists currently. Signed-off-by: Martin Storsjö --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index 11a9ca309d..27f97161f8 100755 --- a/configure +++ b/configure @@ -1578,7 +1578,6 @@ mpeg2video_encoder_select="aandcttables mpegvideoenc" mpeg4_decoder_select="h263_decoder mpeg4video_parser" mpeg4_encoder_select="h263_encoder" msmpeg4v1_decoder_select="h263_decoder" -msmpeg4v1_encoder_select="h263_encoder" msmpeg4v2_decoder_select="h263_decoder" msmpeg4v2_encoder_select="h263_encoder" msmpeg4v3_decoder_select="h263_decoder" From c24469e812501903a46a06eff9722a82e136e841 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Mon, 25 Mar 2013 17:28:37 +0100 Subject: [PATCH 2/2] utils: add workaround for AVHWAccel in ff_get_buffer compat code Since c977039e585bfff28ecc037ef827c6c3d1ed88aa plane count for PIX_FMT_HWACCEL pixel formats is 0 instead of 1. The created dummy AVBuffers are still bogus since AVFrame does not hold frame data when AVHWAccels are used. --- libavcodec/utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index e64ca11d66..2b63759b90 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -661,6 +661,10 @@ do { \ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format); planes = av_pix_fmt_count_planes(frame->format); + /* workaround for AVHWAccel plane count of 0, buf[0] is used as + check for allocated buffers: make libavcodec happy */ + if (desc && desc->flags & PIX_FMT_HWACCEL) + planes = 1; if (!desc || planes <= 0) { ret = AVERROR(EINVAL); goto fail;