ffmpeg (1.2): update to ffmpeg-1.2.1

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2013-07-16 19:17:47 +02:00
parent 2d93744c25
commit 0d63f2e204
39 changed files with 1 additions and 26 deletions

View File

@ -21,7 +21,7 @@
PKG_NAME="ffmpeg"
PKG_VERSION="0.10.7"
if [ "$XBMC" = "master" ]; then
PKG_VERSION="1.2"
PKG_VERSION="1.2.1"
fi
PKG_REV="1"
PKG_ARCH="any"

View File

@ -1,25 +0,0 @@
From b066d90211072c7532e17c0c54d8475f10fc97ad Mon Sep 17 00:00:00 2001
From: Janne Grunau <janne-libav@jannau.net>
Date: Thu, 14 Mar 2013 15:12:30 +0100
Subject: [PATCH] vaapi: fix argument for ff_vaapi_common_end_frame call
---
libavcodec/vaapi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c
index 9c07c8d..0532daf 100644
--- a/libavcodec/vaapi.c
+++ b/libavcodec/vaapi.c
@@ -212,7 +212,7 @@ int ff_vaapi_mpeg_end_frame(AVCodecContext *avctx)
ff_mpeg_draw_horiz_band(s, 0, s->avctx->height);
finish:
- ff_vaapi_common_end_frame(avctx->priv_data);
+ ff_vaapi_common_end_frame(avctx);
return ret;
}
--
1.8.1.5