ffmpeg: update to ffmpeg-1.2.3, sync upstream patches

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue
2013-09-10 01:23:52 +02:00
parent badfce90d2
commit ed2f08ddc6
56 changed files with 2782 additions and 1728 deletions

View File

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

View File

@@ -1,22 +0,0 @@
Subject: [libav-devel] [PATCH 1/2] vaapi: return early from ff_vaapi_render_picture() without picture
From: Janne Grunau janne-libav at jannau.net
Fixes an assertion when called on uninitialized frame. Spotted after
seeking in vlc. (backported from libav mailing list)
---
diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c
index a220a9d..94959bf 100644
--- a/libavcodec/vaapi.c
+++ b/libavcodec/vaapi.c
@@ -46,6 +46,9 @@ int ff_vaapi_render_picture(struct vaapi_context *vactx, VASurfaceID surface)
VABufferID va_buffers[3];
unsigned int n_va_buffers = 0;
+ if (!vactx->pic_param_buf_id)
+ return 0;
+
vaUnmapBuffer(vactx->display, vactx->pic_param_buf_id);
va_buffers[n_va_buffers++] = vactx->pic_param_buf_id;

Some files were not shown because too many files have changed in this diff Show More