[vlc-commits] avcodec: allocate more hardware surfaces for H.264 decoding

[Felix Abecassis]

vlc/vlc-2.1 | branch: master | Felix Abecassis <felix.abecassis at gmail.com> | Thu Mar  6 12:50:19 2014 +0100| [ae9e0fd29b3a74f066c33e4877ae43bfdeb219f5] | committer: Felix Abecassis

avcodec: allocate more hardware surfaces for H.264 decoding

Adapted from 47a9e86e839b455ba256ee89c141298c754d5524 to avoid ABI break.

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=ae9e0fd29b3a74f066c33e4877ae43bfdeb219f5
---

 modules/codec/avcodec/dxva2.c |    2 +-
 modules/codec/avcodec/vaapi.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
index a589696..80643eb 100644
--- a/modules/codec/avcodec/dxva2.c
+++ b/modules/codec/avcodec/dxva2.c
@@ -865,7 +865,7 @@ static int DxCreateVideoDecoder(vlc_va_dxva2_t *va,
     int surface_count;
     switch (codec_id) {
     case AV_CODEC_ID_H264:
-        surface_count = 16 + 1;
+        surface_count = 16 + 1 + 2;
         break;
     default:
         surface_count = 2 + 1;
diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
index d8703a0..9914bbd 100644
--- a/modules/codec/avcodec/vaapi.c
+++ b/modules/codec/avcodec/vaapi.c
@@ -128,7 +128,7 @@ static int Open( vlc_va_t *p_external, int i_codec_id )
         break;
     case AV_CODEC_ID_H264:
         i_profile = VAProfileH264High;
-        i_surface_count = 16+1;
+        i_surface_count = 16 + 1 + 2;
         break;
     default:
         return VLC_EGENERIC;