[arch-commits] Commit in ffmpeg/trunk (PKGBUILD h264-vdpau.patch)

[Ionuț Mircea Bîru]

    Date: Thursday, February 21, 2013 @ 13:49:15
  Author: ioni
Revision: 178408

fix h264 

Added:
  ffmpeg/trunk/h264-vdpau.patch
Modified:
  ffmpeg/trunk/PKGBUILD

------------------+
 PKGBUILD         |    9 ++++++---
 h264-vdpau.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-21 10:10:12 UTC (rev 178407)
+++ PKGBUILD	2013-02-21 12:49:15 UTC (rev 178408)
@@ -5,7 +5,7 @@
 
 pkgname=ffmpeg
 pkgver=1.1.2
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 arch=('i686' 'x86_64')
@@ -18,12 +18,15 @@
       'v4l-utils' 'x264' 'xvidcore' 'zlib'
       )
 makedepends=('libvdpau' 'yasm')
-source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2)
-sha256sums=('dc91e4a2499b05740cfddc2b679694e5c0f2ca20c94191de82d7eb200e8c48ce')
+source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2
+        h264-vdpau.patch)
+sha256sums=('dc91e4a2499b05740cfddc2b679694e5c0f2ca20c94191de82d7eb200e8c48ce'
+            'f55f31a40627ac375fa903c958f34af0f4c72dd9f64dd5f4f64320bb6f126f42')
 
 build() {
   cd $pkgname-$pkgver
 
+  patch -Np1 -i ../h264-vdpau.patch
   ./configure \
     --prefix=/usr \
     --disable-debug \

Added: h264-vdpau.patch
===================================================================
--- h264-vdpau.patch	                        (rev 0)
+++ h264-vdpau.patch	2013-02-21 12:49:15 UTC (rev 178408)
@@ -0,0 +1,26 @@
+X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Fh264.c;h=da749a241d5647751cb5a961429abb6657a79a00;hp=56ef1092bd4509697f11b76ae97757bbc03aef14;hb=c6f59b95c529baf2ea6729ab9089fddce3ddd86a;hpb=6407800521d26b103db4c22d9de709e957381e4b
+
+diff --git a/libavcodec/h264.c b/libavcodec/h264.c
+index 56ef109..da749a2 100644
+--- a/libavcodec/h264.c
++++ b/libavcodec/h264.c
+@@ -2537,11 +2537,17 @@ static enum PixelFormat get_pixel_format(H264Context *h)
+             return s->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ422P
+                                                              : AV_PIX_FMT_YUV422P;
+         } else {
+-            return s->avctx->get_format(s->avctx, s->avctx->codec->pix_fmts ?
++            int i;
++            const enum AVPixelFormat * fmt = s->avctx->codec->pix_fmts ?
+                                         s->avctx->codec->pix_fmts :
+                                         s->avctx->color_range == AVCOL_RANGE_JPEG ?
+                                         hwaccel_pixfmt_list_h264_jpeg_420 :
+-                                        ff_hwaccel_pixfmt_list_420);
++                                        ff_hwaccel_pixfmt_list_420;
++
++            for (i=0; fmt[i] != AV_PIX_FMT_NONE; i++)
++                if (fmt[i] == s->avctx->pix_fmt)
++                    return fmt[i];
++            return s->avctx->get_format(s->avctx, fmt);
+         }
+         break;
+     default: