[SCM] libav/wheezy-security: update and refresh quilt patches

[siretart at users.alioth.debian.org]

The following commit has been merged in the wheezy-security branch:
commit c8e7c74dd751256e560474c831680caf4ce840dc
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Sep 16 22:55:52 2014 -0400

    update and refresh quilt patches

diff --git a/debian/patches/03-disable-configuration-warnings.patch b/debian/patches/03-disable-configuration-warnings.patch
index c68481e..5ce0995 100644
--- a/debian/patches/03-disable-configuration-warnings.patch
+++ b/debian/patches/03-disable-configuration-warnings.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
 
 --- a/cmdutils.c
 +++ b/cmdutils.c
-@@ -457,7 +457,9 @@ void print_error(const char *filename, i
+@@ -462,7 +462,9 @@ void print_error(const char *filename, i
      av_log(NULL, AV_LOG_ERROR, "%s: %s\n", filename, errbuf_ptr);
  }
  
diff --git a/debian/patches/04-ffmpeg-warning-change.patch b/debian/patches/04-ffmpeg-warning-change.patch
deleted file mode 100644
index 0472d45..0000000
--- a/debian/patches/04-ffmpeg-warning-change.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Make warning about deprecation of ffmpeg clearer.
-Origin: Debian
-Forwarded: not-needed
-
---- a/ffmpeg.c
-+++ b/ffmpeg.c
-@@ -4376,9 +4376,10 @@
- 
-     show_banner();
- 
--    av_log(NULL, AV_LOG_WARNING, "This program is not developed anymore and is only "
--                                 "provided for compatibility. Use avconv instead "
--                                 "(see Changelog for the list of incompatible changes).\n");
-+    av_log(NULL, AV_LOG_WARNING, "*** THIS PROGRAM IS DEPRECATED ***\n"
-+                                 "This program is only provided for compatibility "
-+                                 "and will be removed in a future release. Please "
-+                                 "use avconv instead.\n");
- 
-     /* parse options */
-     parse_options(NULL, argc, argv, options, opt_output_file);
diff --git a/debian/patches/05-ff_get_buffer.patch b/debian/patches/05-ff_get_buffer.patch
deleted file mode 100644
index 245c61c..0000000
--- a/debian/patches/05-ff_get_buffer.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/libavcodec/libgsm.c
-+++ b/libavcodec/libgsm.c
-@@ -31,6 +31,7 @@
- 
- #include "avcodec.h"
- #include "gsm.h"
-+#include "internal.h"
- 
- static av_cold int libgsm_encode_init(AVCodecContext *avctx) {
-     if (avctx->channels > 1) {
---- a/libavcodec/libspeexdec.c
-+++ b/libavcodec/libspeexdec.c
-@@ -23,6 +23,7 @@
- #include <speex/speex_stereo.h>
- #include <speex/speex_callbacks.h>
- #include "avcodec.h"
-+#include "internal.h"
- 
- typedef struct {
-     AVFrame frame;
---- a/libavcodec/libopencore-amr.c
-+++ b/libavcodec/libopencore-amr.c
-@@ -22,6 +22,7 @@
- #include "avcodec.h"
- #include "libavutil/avstring.h"
- #include "libavutil/opt.h"
-+#include "internal.h"
- 
- static void amr_decode_fix_avctx(AVCodecContext *avctx)
- {
diff --git a/debian/patches/series b/debian/patches/series
index 847cf51..8e1e269 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 01-Tweak-doxygen-config.patch
 03-disable-configuration-warnings.patch
-04-ffmpeg-warning-change.patch
-05-ff_get_buffer.patch

-- 
Libav/FFmpeg packaging