[vdr-plugin-softhddevice] 01/01: Fixed ffmpeg_2.9 patch

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository vdr-plugin-softhddevice.

commit 7860e0521f1982bd858086c1def64e97ad0062b8
Author: Tobias Grimm <git at e-tobi.net>
Date:   Mon Mar 7 21:32:57 2016 +0100

    Fixed ffmpeg_2.9 patch
---
 debian/patches/ffmpeg_2.9.patch | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
index 4b1649e..9a9cd98 100644
--- a/debian/patches/ffmpeg_2.9.patch
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -307,9 +307,8 @@ Last-Update: <2015-11-02>
      Debug(3, "codec: %d entrypoints\n", entrypoint_n);
      //	look through formats
 -    for (fmt_idx = fmt; *fmt_idx != PIX_FMT_NONE; fmt_idx++) {
--	Debug(3, "\t%#010x %s\n", *fmt_idx, av_get_pix_fmt_name(*fmt_idx));
 +    for (fmt_idx = fmt; *fmt_idx != AV_PIX_FMT_NONE; fmt_idx++) {
-+	Debug(3, "\t%#010x %s\n", *fmt_idx, av_get_AV_PIX_FMT_name(*fmt_idx));
+ 	Debug(3, "\t%#010x %s\n", *fmt_idx, av_get_pix_fmt_name(*fmt_idx));
  	// check supported pixel format with entry point
  	switch (*fmt_idx) {
 -	    case PIX_FMT_VAAPI_VLD:
@@ -324,15 +323,6 @@ Last-Update: <2015-11-02>
  		Debug(3, "codec: this VA-API pixel format is not supported\n");
  	    default:
  		continue;
-@@ -3081,7 +3081,7 @@
-     }
- #endif
- 
--    Debug(3, "\t%#010x %s\n", fmt_idx[0], av_get_pix_fmt_name(fmt_idx[0]));
-+    Debug(3, "\t%#010x %s\n", fmt_idx[0], av_get_AV_PIX_FMT_name(fmt_idx[0]));
-     return *fmt_idx;
- 
-   slow_path:
 @@ -3090,7 +3090,7 @@
      decoder->Entrypoint = VA_INVALID_ID;
      decoder->VaapiContext->config_id = VA_INVALID_ID;
@@ -448,9 +438,8 @@ Last-Update: <2015-11-02>
      //
      Debug(3, "%s: codec %d fmts:\n", __FUNCTION__, video_ctx->codec_id);
 -    for (fmt_idx = fmt; *fmt_idx != PIX_FMT_NONE; fmt_idx++) {
--	Debug(3, "\t%#010x %s\n", *fmt_idx, av_get_pix_fmt_name(*fmt_idx));
 +    for (fmt_idx = fmt; *fmt_idx != AV_PIX_FMT_NONE; fmt_idx++) {
-+	Debug(3, "\t%#010x %s\n", *fmt_idx, av_get_AV_PIX_FMT_name(*fmt_idx));
+ 	Debug(3, "\t%#010x %s\n", *fmt_idx, av_get_pix_fmt_name(*fmt_idx));
  	// check supported pixel format with entry point
  	switch (*fmt_idx) {
 -	    case PIX_FMT_VDPAU_H264:
@@ -477,15 +466,7 @@ Last-Update: <2015-11-02>
  	Error(_("video/vdpau: no valid vdpau pixfmt found\n"));
  	goto slow_path;
      }
-@@ -7526,14 +7526,14 @@
-     }
- #endif
- 
--    Debug(3, "\t%#010x %s\n", fmt_idx[0], av_get_pix_fmt_name(fmt_idx[0]));
-+    Debug(3, "\t%#010x %s\n", fmt_idx[0], av_get_AV_PIX_FMT_name(fmt_idx[0]));
-     return *fmt_idx;
- 
-   slow_path:
+@@ -7533,7 +7533,7 @@
      // no accelerated format found
      decoder->Profile = VDP_INVALID_HANDLE;
      decoder->SurfacesNeeded = VIDEO_SURFACES_MAX + 2;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-softhddevice.git