[SCM] harvid/master: Refresh patch.

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

The following commit has been merged in the master branch:
commit d3ee3216b79971dddc26ca8ea085c0da4d1e3c33
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sat Nov 7 15:19:13 2015 +0100

    Refresh patch.

diff --git a/debian/patches/0003-ffmpeg_2.9.patch b/debian/patches/0003-ffmpeg_2.9.patch
index 4a594ed..22afe31 100644
--- a/debian/patches/0003-ffmpeg_2.9.patch
+++ b/debian/patches/0003-ffmpeg_2.9.patch
@@ -3,8 +3,10 @@ Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
 Last-Update: <2015-11-02>
 Forwarded: robin at gareus.org
 
---- harvid-0.8.0.orig/libharvid/decoder_ctrl.c
-+++ harvid-0.8.0/libharvid/decoder_ctrl.c
+Index: harvid/libharvid/decoder_ctrl.c
+===================================================================
+--- harvid.orig/libharvid/decoder_ctrl.c
++++ harvid/libharvid/decoder_ctrl.c
 @@ -29,7 +29,7 @@
  #include "ffcompat.h"
  #include "dlog.h"
@@ -113,9 +115,11 @@ Forwarded: robin at gareus.org
    if (!jvo) return err;
    my_get_info(jvo->decoder, i);
    jvo->hitcount_info++;
---- harvid-0.8.0.orig/libharvid/ffdecoder.c
-+++ harvid-0.8.0/libharvid/ffdecoder.c
-@@ -103,7 +103,7 @@ static int ff_getbuffersize(void *ptr, s
+Index: harvid/libharvid/ffdecoder.c
+===================================================================
+--- harvid.orig/libharvid/ffdecoder.c
++++ harvid/libharvid/ffdecoder.c
+@@ -102,7 +102,7 @@ static int ff_getbuffersize(void *ptr, s
  
  static void render_empty_frame(ffst *ff, uint8_t* buf, int w, int h, int xoff, int ys) {
    switch (ff->render_fmt) {
@@ -124,7 +128,7 @@ Forwarded: robin at gareus.org
        {
  	int i;
  	for (i = 0; i < w*h*2; i += 2) {
-@@ -111,7 +111,7 @@ static void render_empty_frame(ffst *ff,
+@@ -110,7 +110,7 @@ static void render_empty_frame(ffst *ff,
  	}
        }
        break;
@@ -133,7 +137,7 @@ Forwarded: robin at gareus.org
        {
  	int i;
  	for (i = 0; i < w*h*2; i += 2) {
-@@ -119,25 +119,25 @@ static void render_empty_frame(ffst *ff,
+@@ -118,25 +118,25 @@ static void render_empty_frame(ffst *ff,
  	}
        }
        break;
@@ -166,7 +170,7 @@ Forwarded: robin at gareus.org
        memset(buf, 0, ff_getbuffersize(ff, NULL));
        break;
      default:
-@@ -148,8 +148,8 @@ static void render_empty_frame(ffst *ff,
+@@ -147,8 +147,8 @@ static void render_empty_frame(ffst *ff,
  #if 1 // draw cross
    int x,y;
    switch (ff->render_fmt) {
@@ -177,7 +181,7 @@ Forwarded: robin at gareus.org
        for (x = 0, y = 0; x < w-1; x++, y = h * x / w) {
  	int off = (x + w * y);
  	buf[off]=127; buf[off+1]=127;
-@@ -157,8 +157,8 @@ static void render_empty_frame(ffst *ff,
+@@ -156,8 +156,8 @@ static void render_empty_frame(ffst *ff,
  	buf[off]=127; buf[off+1]=127;
        }
        break;
@@ -188,7 +192,7 @@ Forwarded: robin at gareus.org
        for (x = 0, y = 0; x < w-1; x++, y = h * x / w) {
  	int off = (x + w * y) * 2;
  	buf[off] = 127; buf[off+1] = 127;
-@@ -166,8 +166,8 @@ static void render_empty_frame(ffst *ff,
+@@ -165,8 +165,8 @@ static void render_empty_frame(ffst *ff,
  	buf[off] = 127; buf[off+1] = 127;
        }
        break;
@@ -199,7 +203,7 @@ Forwarded: robin at gareus.org
        for (x = 0, y = 0; x < w-1; x++, y = h * x / w) {
  	int off = 3 * (x + w * y);
  	buf[off]=255; buf[off+1]=255; buf[off+2]=255;
-@@ -175,11 +175,11 @@ static void render_empty_frame(ffst *ff,
+@@ -174,11 +174,11 @@ static void render_empty_frame(ffst *ff,
  	buf[off]=255; buf[off+1]=255; buf[off+2]=255;
        }
        break;
@@ -215,7 +219,7 @@ Forwarded: robin at gareus.org
        for (x = 0, y = 0; x < w-1; x++, y = h * x / w) {
  	int off = 4 * (x + w * y) + O;
  	buf[off]=255; buf[off+1]=255; buf[off+2]=255;
-@@ -726,7 +726,7 @@ void ff_get_info_canonical(void *ptr, VI
+@@ -749,7 +749,7 @@ void ff_get_info_canonical(void *ptr, VI
  
  void ff_create(void **ff) {
    (*((ffst**)ff)) = (ffst*) calloc(1, sizeof(ffst));
@@ -224,7 +228,7 @@ Forwarded: robin at gareus.org
    (*((ffst**)ff))->want_ignstart = 0;
    (*((ffst**)ff))->want_genpts = 0;
    (*((ffst**)ff))->packet.data = NULL;
-@@ -769,25 +769,25 @@ void ff_resize(void *ptr, int w, int h,
+@@ -792,25 +792,25 @@ void ff_resize(void *ptr, int w, int h,
  
  const char * ff_fmt_to_text(int fmt) {
    switch (fmt) {
@@ -260,8 +264,10 @@ Forwarded: robin at gareus.org
        return "YUV440P";
      default:
        return "?";
---- harvid-0.8.0.orig/src/ics_handler.c
-+++ harvid-0.8.0/src/ics_handler.c
+Index: harvid/src/ics_handler.c
+===================================================================
+--- harvid.orig/src/ics_handler.c
++++ harvid/src/ics_handler.c
 @@ -109,16 +109,16 @@ void parse_param(struct queryparserstate
      else if (!strncmp(val, "jpeg",4)) {qps->a->render_fmt = FMT_JPG; qps->a->misc_int = atoi(&val[4]);}
      else if (!strcmp(val, "png"))      qps->a->render_fmt = FMT_PNG;

-- 
harvid packaging