[SCM] harvid/master: Remove libav patch.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f39328c93a7e6edfe8e33b8dfe5e417545685178
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Nov 3 08:01:21 2015 +0100

    Remove libav patch.

diff --git a/debian/patches/0001-Fix-build-with-libav-10.patch b/debian/patches/0001-Fix-build-with-libav-10.patch
deleted file mode 100644
index 6dc273f..0000000
--- a/debian/patches/0001-Fix-build-with-libav-10.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From c4cb7da2e9727f561f05f515278231a655b31464 Mon Sep 17 00:00:00 2001
-From: Anton Khirnov <anton at khirnov.net>
-Date: Sun, 26 Oct 2014 17:17:33 +0100
-Subject: [PATCH] Fix build with libav 10.
-
----
- libharvid/ffdecoder.c | 27 ++-------------------------
- 1 file changed, 2 insertions(+), 25 deletions(-)
-
-diff --git a/libharvid/ffdecoder.c b/libharvid/ffdecoder.c
-index 1a9728d..d2dfae5 100644
---- a/libharvid/ffdecoder.c
-+++ b/libharvid/ffdecoder.c
-@@ -32,6 +32,7 @@
- 
- #include "ffcompat.h"
- #include <libswscale/swscale.h>
-+#include <libavutil/mathematics.h>
- 
- #ifndef MAX
- #define MAX(A,B) ( ( (A) > (B) ) ? (A) : (B) )
-@@ -307,25 +308,14 @@ static void ff_set_framerate(ffst *ff) {
-   ff->tc.num = 0;
-   ff->tc.den = 1;
- 
--#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(55, 0, 100) // 9cf788eca8ba (merge a75f01d7e0)
-   {
--    AVRational fr = av_stream->r_frame_rate;
--    if (fr.den > 0 && fr.num > 0) {
--      ff->framerate = av_q2d (av_stream->r_frame_rate);
--      ff->tc.num = fr.num;
--      ff->tc.den = fr.den;
--    }
--  }
--#else
--  {
--    AVRational fr = av_stream_get_r_frame_rate (av_stream);
-+    AVRational fr = av_stream->avg_frame_rate;
-     if (fr.den > 0 && fr.num > 0) {
-       ff->framerate = av_q2d (fr);
-       ff->tc.num = fr.num;
-       ff->tc.den = fr.den;
-     }
-   }
--#endif
-   if (ff->framerate < 1 || ff->framerate > 1000) {
-     AVRational fr = av_stream->avg_frame_rate;
-     if (fr.den > 0 && fr.num > 0) {
-@@ -533,19 +523,6 @@ static uint64_t parse_pts_from_frame (AVFrame *f) {
- 
-   pts = AV_NOPTS_VALUE;
- 
--#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 49, 100)
--  if (pts == AV_NOPTS_VALUE) {
--    pts = av_frame_get_best_effort_timestamp (f);
--    if (pts != AV_NOPTS_VALUE) {
--      if (!(pts_warn & 1) && want_verbose)
--	fprintf(stderr, "PTS: Best effort.\n");
--      pts_warn |= 1;
--    }
--  }
--#else
--#warning building with libavutil < 51.49.100 is highly discouraged
--#endif
--
-   if (pts == AV_NOPTS_VALUE) {
-     pts = f->pkt_pts;
-     if (pts != AV_NOPTS_VALUE) {
--- 
-2.0.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 392eb74..f408a9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-#0001-Fix-build-with-libav-10.patch
 0002-spelling.patch
 0003-ffmpeg_2.9.patch

-- 
harvid packaging