[SCM] libav/experimental: Include all post 9beta2 patches

Thu Nov 15 21:36:42 UTC 2012

The following commit has been merged in the experimental branch:
commit fa78b708ad55a73f26cbc6d65a968e9999ac6e08
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Nov 15 19:23:39 2012 +0100

    Include all post 9beta2 patches

diff --git a/debian/patches/post-9beta2/0001-lzo-Use-AV_COPY-U-macros-where-appropriate.patch b/debian/patches/post-9beta2/0001-lzo-Use-AV_COPY-U-macros-where-appropriate.patch
index a36e4cc..c4ee7e7 100644
--- a/debian/patches/post-9beta2/0001-lzo-Use-AV_COPY-U-macros-where-appropriate.patch
+++ b/debian/patches/post-9beta2/0001-lzo-Use-AV_COPY-U-macros-where-appropriate.patch
@@ -1,7 +1,7 @@
 From ceb754d041f5f6327fd9195a5f43575af9516daa Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Mon, 22 Oct 2012 19:02:20 +0200
-Subject: [PATCH 001/204] lzo: Use AV_COPY*U macros where appropriate
+Subject: [PATCH 001/278] lzo: Use AV_COPY*U macros where appropriate
 
 ---
  libavutil/lzo.c |   28 ++++++++--------------------
diff --git a/debian/patches/post-9beta2/0002-Remove-need-for-padding-in-av_memcpy_backptr.patch b/debian/patches/post-9beta2/0002-Remove-need-for-padding-in-av_memcpy_backptr.patch
index bb4e532..f1db900 100644
--- a/debian/patches/post-9beta2/0002-Remove-need-for-padding-in-av_memcpy_backptr.patch
+++ b/debian/patches/post-9beta2/0002-Remove-need-for-padding-in-av_memcpy_backptr.patch
@@ -1,7 +1,7 @@
 From d82f188504410fdfa446c5682c128c31bb5851a4 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans at mansr.com>
 Date: Tue, 23 Oct 2012 18:05:45 +0100
-Subject: [PATCH 002/204] Remove need for padding in av_memcpy_backptr()
+Subject: [PATCH 002/278] Remove need for padding in av_memcpy_backptr()
 
 Signed-off-by: Mans Rullgard <mans at mansr.com>
 ---
diff --git a/debian/patches/post-9beta2/0003-av_memcpy_backptr-Drop-no-longer-necessary-malloc-pa.patch b/debian/patches/post-9beta2/0003-av_memcpy_backptr-Drop-no-longer-necessary-malloc-pa.patch
index 5c7ccc6..4fdd602 100644
--- a/debian/patches/post-9beta2/0003-av_memcpy_backptr-Drop-no-longer-necessary-malloc-pa.patch
+++ b/debian/patches/post-9beta2/0003-av_memcpy_backptr-Drop-no-longer-necessary-malloc-pa.patch
@@ -1,7 +1,7 @@
 From e831b3b852a23cd24f2941e68bd65299ce306880 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Tue, 23 Oct 2012 19:22:52 +0200
-Subject: [PATCH 003/204] av_memcpy_backptr: Drop no longer necessary malloc
+Subject: [PATCH 003/278] av_memcpy_backptr: Drop no longer necessary malloc
  padding
 
 Signed-off-by: Mans Rullgard <mans at mansr.com>
diff --git a/debian/patches/post-9beta2/0004-dfa-use-av_memcpy_backptr-where-previously-impossibl.patch b/debian/patches/post-9beta2/0004-dfa-use-av_memcpy_backptr-where-previously-impossibl.patch
index 87940c1..829f278 100644
--- a/debian/patches/post-9beta2/0004-dfa-use-av_memcpy_backptr-where-previously-impossibl.patch
+++ b/debian/patches/post-9beta2/0004-dfa-use-av_memcpy_backptr-where-previously-impossibl.patch
@@ -1,7 +1,7 @@
 From a153e45b953dee5b065939300d3a591772f43b19 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans at mansr.com>
 Date: Tue, 23 Oct 2012 18:17:46 +0100
-Subject: [PATCH 004/204] dfa: use av_memcpy_backptr() where previously
+Subject: [PATCH 004/278] dfa: use av_memcpy_backptr() where previously
  impossible
 
 Since the requirement for output padding has been lifted, we can
diff --git a/debian/patches/post-9beta2/0005-doxygen-Build-Doxygen-documentation-in-the-doc-subdi.patch b/debian/patches/post-9beta2/0005-doxygen-Build-Doxygen-documentation-in-the-doc-subdi.patch
index 50e9dd4..f082b0b 100644
--- a/debian/patches/post-9beta2/0005-doxygen-Build-Doxygen-documentation-in-the-doc-subdi.patch
+++ b/debian/patches/post-9beta2/0005-doxygen-Build-Doxygen-documentation-in-the-doc-subdi.patch
@@ -1,7 +1,7 @@
 From d7a39b33407927005f65755b8a3a608394aaeccd Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Mon, 22 Oct 2012 16:01:18 +0200
-Subject: [PATCH 005/204] doxygen: Build Doxygen documentation in the doc/
+Subject: [PATCH 005/278] doxygen: Build Doxygen documentation in the doc/
  subdirectory
 
 ---
diff --git a/debian/patches/post-9beta2/0006-Move-Doxyfile-into-the-doc-subdirectory.patch b/debian/patches/post-9beta2/0006-Move-Doxyfile-into-the-doc-subdirectory.patch
index aad81a2..768ebba 100644
--- a/debian/patches/post-9beta2/0006-Move-Doxyfile-into-the-doc-subdirectory.patch
+++ b/debian/patches/post-9beta2/0006-Move-Doxyfile-into-the-doc-subdirectory.patch
@@ -1,7 +1,7 @@
 From 5e28e974339e90c2cee866bedbd913fe42917b15 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Mon, 22 Oct 2012 16:03:39 +0200
-Subject: [PATCH 006/204] Move Doxyfile into the doc/ subdirectory
+Subject: [PATCH 006/278] Move Doxyfile into the doc/ subdirectory
 
 ---
  Doxyfile     | 1647 ----------------------------------------------------------
diff --git a/debian/patches/post-9beta2/0007-lavc-use-the-correct-API-version-guard-macro-for-avc.patch b/debian/patches/post-9beta2/0007-lavc-use-the-correct-API-version-guard-macro-for-avc.patch
index 7f546ff..60d420e 100644
--- a/debian/patches/post-9beta2/0007-lavc-use-the-correct-API-version-guard-macro-for-avc.patch
+++ b/debian/patches/post-9beta2/0007-lavc-use-the-correct-API-version-guard-macro-for-avc.patch
@@ -1,7 +1,7 @@
 From a5ef830b1226273c35d4baa1c2e4e7e1c9de7c7d Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Tue, 23 Oct 2012 13:25:53 -0400
-Subject: [PATCH 007/204] lavc: use the correct API version guard macro for
+Subject: [PATCH 007/278] lavc: use the correct API version guard macro for
  avcodec_encode_audio()
 
 ---
diff --git a/debian/patches/post-9beta2/0008-atrac3-return-an-error-if-extradata_size-is-not-a-sp.patch b/debian/patches/post-9beta2/0008-atrac3-return-an-error-if-extradata_size-is-not-a-sp.patch
index 56b1222..6333edd 100644
--- a/debian/patches/post-9beta2/0008-atrac3-return-an-error-if-extradata_size-is-not-a-sp.patch
+++ b/debian/patches/post-9beta2/0008-atrac3-return-an-error-if-extradata_size-is-not-a-sp.patch
@@ -1,7 +1,7 @@
 From 44d854a518f97cb65090420b0b9f55611a0ea932 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Mon, 22 Oct 2012 10:44:55 -0400
-Subject: [PATCH 008/204] atrac3: return an error if extradata_size is not a
+Subject: [PATCH 008/278] atrac3: return an error if extradata_size is not a
  specific known size
 
 Also fixes 3 compiler warnings about using uninitialized variables.
diff --git a/debian/patches/post-9beta2/0009-lavc-fix-documentation-for-AVCodecContext.delay.patch b/debian/patches/post-9beta2/0009-lavc-fix-documentation-for-AVCodecContext.delay.patch
index c684daa..744ad1a 100644
--- a/debian/patches/post-9beta2/0009-lavc-fix-documentation-for-AVCodecContext.delay.patch
+++ b/debian/patches/post-9beta2/0009-lavc-fix-documentation-for-AVCodecContext.delay.patch
@@ -1,7 +1,7 @@
 From c68317ebbe4915035df0b08c23eea7a0b80ab881 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Tue, 2 Oct 2012 11:38:34 -0400
-Subject: [PATCH 009/204] lavc: fix documentation for AVCodecContext.delay
+Subject: [PATCH 009/278] lavc: fix documentation for AVCodecContext.delay
 
 ---
  libavcodec/avcodec.h |    2 +-
diff --git a/debian/patches/post-9beta2/0010-lavc-initialize-output-AVFrame-before-decoding.patch b/debian/patches/post-9beta2/0010-lavc-initialize-output-AVFrame-before-decoding.patch
index d27289e..6d0a424 100644
--- a/debian/patches/post-9beta2/0010-lavc-initialize-output-AVFrame-before-decoding.patch
+++ b/debian/patches/post-9beta2/0010-lavc-initialize-output-AVFrame-before-decoding.patch
@@ -1,7 +1,7 @@
 From 1bc64c2814d409d3cc129c27c493ee915bebdc4a Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Tue, 23 Oct 2012 08:22:23 +0200
-Subject: [PATCH 010/204] lavc: initialize output AVFrame before decoding.
+Subject: [PATCH 010/278] lavc: initialize output AVFrame before decoding.
 
 Avoids memleaks with audio when extended_data is nontrivial and the user
 doesn't reset the frame.
diff --git a/debian/patches/post-9beta2/0011-avconv-remove-now-unneeded-calls-to-avcodec_get_fram.patch b/debian/patches/post-9beta2/0011-avconv-remove-now-unneeded-calls-to-avcodec_get_fram.patch
index 5e44fad..6839d52 100644
--- a/debian/patches/post-9beta2/0011-avconv-remove-now-unneeded-calls-to-avcodec_get_fram.patch
+++ b/debian/patches/post-9beta2/0011-avconv-remove-now-unneeded-calls-to-avcodec_get_fram.patch
@@ -1,7 +1,7 @@
 From 8e84f2055c4170e502d36db3539b5e243a5b6cca Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Tue, 23 Oct 2012 08:32:56 +0200
-Subject: [PATCH 011/204] avconv: remove now unneeded calls to
+Subject: [PATCH 011/278] avconv: remove now unneeded calls to
  avcodec_get_frame_defaults().
 
 ---
diff --git a/debian/patches/post-9beta2/0012-g.723.1-add-missing-CODEC_CAP_DR1.patch b/debian/patches/post-9beta2/0012-g.723.1-add-missing-CODEC_CAP_DR1.patch
index 9c1390d..c74cda5 100644
--- a/debian/patches/post-9beta2/0012-g.723.1-add-missing-CODEC_CAP_DR1.patch
+++ b/debian/patches/post-9beta2/0012-g.723.1-add-missing-CODEC_CAP_DR1.patch
@@ -1,7 +1,7 @@
 From 5a9567631a909a4c76dc678ebd603ffc4d57262d Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Wed, 17 Oct 2012 12:16:00 +0200
-Subject: [PATCH 012/204] g.723.1: add missing CODEC_CAP_DR1
+Subject: [PATCH 012/278] g.723.1: add missing CODEC_CAP_DR1
 
 ---
  libavcodec/g723_1.c |    2 +-
diff --git a/debian/patches/post-9beta2/0013-asfdec-cosmetics-reformat-ff_asf_parse_packet.patch b/debian/patches/post-9beta2/0013-asfdec-cosmetics-reformat-ff_asf_parse_packet.patch
index 1c2527e..294097f 100644
--- a/debian/patches/post-9beta2/0013-asfdec-cosmetics-reformat-ff_asf_parse_packet.patch
+++ b/debian/patches/post-9beta2/0013-asfdec-cosmetics-reformat-ff_asf_parse_packet.patch
@@ -1,7 +1,7 @@
 From 292a08cbab3392a693b1c3b03a9cac6a1b65d304 Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Sat, 20 Oct 2012 17:15:57 +0200
-Subject: [PATCH 013/204] asfdec: cosmetics, reformat ff_asf_parse_packet()
+Subject: [PATCH 013/278] asfdec: cosmetics, reformat ff_asf_parse_packet()
 
 ---
  libavformat/asfdec.c |  138 ++++++++++++++++++++++++++------------------------
diff --git a/debian/patches/post-9beta2/0014-smoothstreamingenc-Don-t-assume-streams-start-from-t.patch b/debian/patches/post-9beta2/0014-smoothstreamingenc-Don-t-assume-streams-start-from-t.patch
index ee935c8..fad2451 100644
--- a/debian/patches/post-9beta2/0014-smoothstreamingenc-Don-t-assume-streams-start-from-t.patch
+++ b/debian/patches/post-9beta2/0014-smoothstreamingenc-Don-t-assume-streams-start-from-t.patch
@@ -1,7 +1,7 @@
 From c44cef978bd5c2692606a7a4ef4a7da393147ab0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
 Date: Wed, 24 Oct 2012 01:05:12 +0300
-Subject: [PATCH 014/204] smoothstreamingenc: Don't assume streams start from
+Subject: [PATCH 014/278] smoothstreamingenc: Don't assume streams start from
  timestamp 0
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
diff --git a/debian/patches/post-9beta2/0015-configure-generalise-64-bit-test.patch b/debian/patches/post-9beta2/0015-configure-generalise-64-bit-test.patch
index fe718c9..dc16c0b 100644
--- a/debian/patches/post-9beta2/0015-configure-generalise-64-bit-test.patch
+++ b/debian/patches/post-9beta2/0015-configure-generalise-64-bit-test.patch
@@ -1,7 +1,7 @@
 From d4c99513f41272b9753e59642724717b834710a0 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans at mansr.com>
 Date: Tue, 23 Oct 2012 23:33:44 +0100
-Subject: [PATCH 015/204] configure: generalise 64-bit test
+Subject: [PATCH 015/278] configure: generalise 64-bit test
 
 Signed-off-by: Mans Rullgard <mans at mansr.com>
 ---
diff --git a/debian/patches/post-9beta2/0016-configure-detect-mips64-automatically.patch b/debian/patches/post-9beta2/0016-configure-detect-mips64-automatically.patch
index 1fb5351..51be561 100644
--- a/debian/patches/post-9beta2/0016-configure-detect-mips64-automatically.patch
+++ b/debian/patches/post-9beta2/0016-configure-detect-mips64-automatically.patch
@@ -1,7 +1,7 @@
 From 2acda282eb8efac556cb351e91c557e580406294 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans at mansr.com>
 Date: Tue, 23 Oct 2012 23:34:35 +0100
-Subject: [PATCH 016/204] configure: detect mips64 automatically
+Subject: [PATCH 016/278] configure: detect mips64 automatically
 
 Signed-off-by: Mans Rullgard <mans at mansr.com>
 ---
diff --git a/debian/patches/post-9beta2/0017-configure-detect-ppc64-automatically.patch b/debian/patches/post-9beta2/0017-configure-detect-ppc64-automatically.patch
index c025f6b..3b44998 100644
--- a/debian/patches/post-9beta2/0017-configure-detect-ppc64-automatically.patch
+++ b/debian/patches/post-9beta2/0017-configure-detect-ppc64-automatically.patch
@@ -1,7 +1,7 @@
 From 56203596aea365387917c40964c03b5156b15e22 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans at mansr.com>
 Date: Tue, 23 Oct 2012 23:39:40 +0100
-Subject: [PATCH 017/204] configure: detect ppc64 automatically
+Subject: [PATCH 017/278] configure: detect ppc64 automatically
 
 Signed-off-by: Mans Rullgard <mans at mansr.com>
 ---
diff --git a/debian/patches/post-9beta2/0018-configure-detect-parisc64-automatically.patch b/debian/patches/post-9beta2/0018-configure-detect-parisc64-automatically.patch
index 6954994..837ed38 100644
--- a/debian/patches/post-9beta2/0018-configure-detect-parisc64-automatically.patch
+++ b/debian/patches/post-9beta2/0018-configure-detect-parisc64-automatically.patch
@@ -1,7 +1,7 @@
 From a6e9d6497739b7b60e3284f03b27883514bbc94a Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans at mansr.com>
 Date: Wed, 24 Oct 2012 00:21:15 +0100
-Subject: [PATCH 018/204] configure: detect parisc64 automatically
+Subject: [PATCH 018/278] configure: detect parisc64 automatically
 
 Signed-off-by: Mans Rullgard <mans at mansr.com>
 ---
diff --git a/debian/patches/post-9beta2/0019-avutil-Move-memcpy_backptr-to-mem.c.patch b/debian/patches/post-9beta2/0019-avutil-Move-memcpy_backptr-to-mem.c.patch
index 2269775..7f4ee90 100644
--- a/debian/patches/post-9beta2/0019-avutil-Move-memcpy_backptr-to-mem.c.patch
+++ b/debian/patches/post-9beta2/0019-avutil-Move-memcpy_backptr-to-mem.c.patch
@@ -1,7 +1,7 @@
 From 5bac2d0c3020587a03cb14e8b6a664a0b92f26c2 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Thu, 18 Oct 2012 19:27:51 +0200
-Subject: [PATCH 019/204] avutil: Move memcpy_backptr() to mem.c
+Subject: [PATCH 019/278] avutil: Move memcpy_backptr() to mem.c
 
 The function is used elsewhere and does not belong with the LZO code.
 ---
diff --git a/debian/patches/post-9beta2/0020-avutil-Make-LZO-decoder-code-configure-time-selectab.patch b/debian/patches/post-9beta2/0020-avutil-Make-LZO-decoder-code-configure-time-selectab.patch
index ee3bec7..3fe5ec8 100644
--- a/debian/patches/post-9beta2/0020-avutil-Make-LZO-decoder-code-configure-time-selectab.patch
+++ b/debian/patches/post-9beta2/0020-avutil-Make-LZO-decoder-code-configure-time-selectab.patch
@@ -1,7 +1,7 @@
 From 2a91ada8282f18d2807abee5188225bba1b19bda Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Thu, 18 Oct 2012 19:48:27 +0200
-Subject: [PATCH 020/204] avutil: Make LZO decoder code configure-time
+Subject: [PATCH 020/278] avutil: Make LZO decoder code configure-time
  selectable
 
 ---
diff --git a/debian/patches/post-9beta2/0021-rawvideo-use-a-specific-read_header.patch b/debian/patches/post-9beta2/0021-rawvideo-use-a-specific-read_header.patch
index d556aed..bf8f05a 100644
--- a/debian/patches/post-9beta2/0021-rawvideo-use-a-specific-read_header.patch
+++ b/debian/patches/post-9beta2/0021-rawvideo-use-a-specific-read_header.patch
@@ -1,7 +1,7 @@
 From 42c26a4864f1cefa4175c6c171aa0e4bd88dd42d Mon Sep 17 00:00:00 2001
 From: Luca Barbato <lu_zero at gentoo.org>
 Date: Wed, 24 Oct 2012 14:18:49 +0200
-Subject: [PATCH 021/204] rawvideo: use a specific read_header
+Subject: [PATCH 021/278] rawvideo: use a specific read_header
 
 ff_raw_read_header is used only for this demuxer for video.
 ---
diff --git a/debian/patches/post-9beta2/0022-g722-refactor-out-of-rawdec.c.patch b/debian/patches/post-9beta2/0022-g722-refactor-out-of-rawdec.c.patch
index 1e7e690..a406d31 100644
--- a/debian/patches/post-9beta2/0022-g722-refactor-out-of-rawdec.c.patch
+++ b/debian/patches/post-9beta2/0022-g722-refactor-out-of-rawdec.c.patch
@@ -1,7 +1,7 @@
 From 5f0e161dd61552ad70760bad35b869eaec7368ff Mon Sep 17 00:00:00 2001
 From: Luca Barbato <lu_zero at gentoo.org>
 Date: Wed, 24 Oct 2012 18:18:18 +0200
-Subject: [PATCH 022/204] g722: refactor out of rawdec.c
+Subject: [PATCH 022/278] g722: refactor out of rawdec.c
 
 ---
  libavformat/Makefile |    2 +-
diff --git a/debian/patches/post-9beta2/0023-pcmdec-remove-dependency-from-rawdec.patch b/debian/patches/post-9beta2/0023-pcmdec-remove-dependency-from-rawdec.patch
index eadca37..89fdf1c 100644
--- a/debian/patches/post-9beta2/0023-pcmdec-remove-dependency-from-rawdec.patch
+++ b/debian/patches/post-9beta2/0023-pcmdec-remove-dependency-from-rawdec.patch
@@ -1,7 +1,7 @@
 From 2ef4d586d6352a69c0669d53ce1035eb7d8db0e8 Mon Sep 17 00:00:00 2001
 From: Luca Barbato <lu_zero at gentoo.org>
 Date: Wed, 24 Oct 2012 19:15:50 +0200
-Subject: [PATCH 023/204] pcmdec: remove dependency from rawdec
+Subject: [PATCH 023/278] pcmdec: remove dependency from rawdec
 
 The code shared is not actually shared with anything else.
 ---
diff --git a/debian/patches/post-9beta2/0024-rawdec-remove-ff_raw_read_header.patch b/debian/patches/post-9beta2/0024-rawdec-remove-ff_raw_read_header.patch
index abf2af7..88d82f2 100644
--- a/debian/patches/post-9beta2/0024-rawdec-remove-ff_raw_read_header.patch
+++ b/debian/patches/post-9beta2/0024-rawdec-remove-ff_raw_read_header.patch
@@ -1,7 +1,7 @@
 From 587874ef1c94a9b863d2f2db0e5d341e086ee232 Mon Sep 17 00:00:00 2001
 From: Luca Barbato <lu_zero at gentoo.org>
 Date: Wed, 24 Oct 2012 19:53:32 +0200
-Subject: [PATCH 024/204] rawdec: remove ff_raw_read_header
+Subject: [PATCH 024/278] rawdec: remove ff_raw_read_header
 
 It is not used anymore and is a kludge.
 ---
diff --git a/debian/patches/post-9beta2/0025-avfilter-fix-graphparser-memleaks-on-error-paths.patch b/debian/patches/post-9beta2/0025-avfilter-fix-graphparser-memleaks-on-error-paths.patch
index 5be5fa0..d4b1631 100644
--- a/debian/patches/post-9beta2/0025-avfilter-fix-graphparser-memleaks-on-error-paths.patch
+++ b/debian/patches/post-9beta2/0025-avfilter-fix-graphparser-memleaks-on-error-paths.patch
@@ -1,7 +1,7 @@
 From 285b706b551b94e18f875ed01163926c8b98e68b Mon Sep 17 00:00:00 2001
 From: Janne Grunau <janne-libav at jannau.net>
 Date: Tue, 9 Oct 2012 21:28:32 +0200
-Subject: [PATCH 025/204] avfilter: fix graphparser memleaks on error paths
+Subject: [PATCH 025/278] avfilter: fix graphparser memleaks on error paths
 
 Fixes CID700635, CID700636 and CID732274.
 ---
diff --git a/debian/patches/post-9beta2/0026-avconv-fix-bitrate-report-when-writing-to-dev-null.patch b/debian/patches/post-9beta2/0026-avconv-fix-bitrate-report-when-writing-to-dev-null.patch
index cb505a4..72add57 100644
--- a/debian/patches/post-9beta2/0026-avconv-fix-bitrate-report-when-writing-to-dev-null.patch
+++ b/debian/patches/post-9beta2/0026-avconv-fix-bitrate-report-when-writing-to-dev-null.patch
@@ -1,7 +1,7 @@
 From 1b891d17c531e8a63c2974aab4bf997ce70746f3 Mon Sep 17 00:00:00 2001
 From: Janne Grunau <janne-libav at jannau.net>
 Date: Tue, 9 Oct 2012 23:22:49 +0200
-Subject: [PATCH 026/204] avconv: fix bitrate report when writing to /dev/null
+Subject: [PATCH 026/278] avconv: fix bitrate report when writing to /dev/null
 
 avio_size() reports the filesize which returns 0 for /dev/null.
 avio_tell() reports the current position.
diff --git a/debian/patches/post-9beta2/0027-pcmdec-change-default-of-channels-parameter-to-1.patch b/debian/patches/post-9beta2/0027-pcmdec-change-default-of-channels-parameter-to-1.patch
index f5f1a09..040f07c 100644
--- a/debian/patches/post-9beta2/0027-pcmdec-change-default-of-channels-parameter-to-1.patch
+++ b/debian/patches/post-9beta2/0027-pcmdec-change-default-of-channels-parameter-to-1.patch
@@ -1,7 +1,7 @@
 From dcdfb8ede3580cde6acc1c6ca889ad3b610d75dc Mon Sep 17 00:00:00 2001
 From: Janne Grunau <janne-libav at jannau.net>
 Date: Thu, 25 Oct 2012 15:10:22 +0200
-Subject: [PATCH 027/204] pcmdec: change default of channels parameter to 1
+Subject: [PATCH 027/278] pcmdec: change default of channels parameter to 1
 
 This was previously implicitly done in ff_raw_read_header().
 Fixes fate tests with pcm input.
diff --git a/debian/patches/post-9beta2/0028-ffv1-set-the-range-coder-state-in-decode_slice_heade.patch b/debian/patches/post-9beta2/0028-ffv1-set-the-range-coder-state-in-decode_slice_heade.patch
index 31de0d3..f2e469f 100644
--- a/debian/patches/post-9beta2/0028-ffv1-set-the-range-coder-state-in-decode_slice_heade.patch
+++ b/debian/patches/post-9beta2/0028-ffv1-set-the-range-coder-state-in-decode_slice_heade.patch
@@ -1,7 +1,7 @@
 From 22f7942fe7d7349e3562ac68fa101d9efec522df Mon Sep 17 00:00:00 2001
 From: Luca Barbato <lu_zero at gentoo.org>
 Date: Thu, 25 Oct 2012 15:42:08 +0200
-Subject: [PATCH 028/204] ffv1: set the range coder state in
+Subject: [PATCH 028/278] ffv1: set the range coder state in
  decode_slice_header
 
 ---
diff --git a/debian/patches/post-9beta2/0029-pcm-change-references-to-raw-to-pcm.patch b/debian/patches/post-9beta2/0029-pcm-change-references-to-raw-to-pcm.patch
index 93fcbdc..930763c 100644
--- a/debian/patches/post-9beta2/0029-pcm-change-references-to-raw-to-pcm.patch
+++ b/debian/patches/post-9beta2/0029-pcm-change-references-to-raw-to-pcm.patch
@@ -1,7 +1,7 @@
 From 254056c4ab6161d687caf8e9b837571db76e60c6 Mon Sep 17 00:00:00 2001
 From: Luca Barbato <lu_zero at gentoo.org>
 Date: Mon, 1 Jan 2001 01:08:20 +0100
-Subject: [PATCH 029/204] pcm: change references to raw to pcm
+Subject: [PATCH 029/278] pcm: change references to raw to pcm
 
 ---
  libavformat/pcmdec.c |   20 ++++++++++----------
diff --git a/debian/patches/post-9beta2/0030-build-Include-HEADERS-yes-in-the-HEADERS-variable.patch b/debian/patches/post-9beta2/0030-build-Include-HEADERS-yes-in-the-HEADERS-variable.patch
index 35f4f1a..1ad38e8 100644
--- a/debian/patches/post-9beta2/0030-build-Include-HEADERS-yes-in-the-HEADERS-variable.patch
+++ b/debian/patches/post-9beta2/0030-build-Include-HEADERS-yes-in-the-HEADERS-variable.patch
@@ -1,7 +1,7 @@
 From 121604b024cfd04644a9aa6012bd0e9a48efbd9f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
 Date: Thu, 25 Oct 2012 17:13:06 +0300
-Subject: [PATCH 030/204] build: Include HEADERS-yes in the HEADERS variable
+Subject: [PATCH 030/278] build: Include HEADERS-yes in the HEADERS variable
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/debian/patches/post-9beta2/0031-configure-recognise-more-sparc-variants-as-cpu-argum.patch b/debian/patches/post-9beta2/0031-configure-recognise-more-sparc-variants-as-cpu-argum.patch
index 74f7604..d3456ab 100644
--- a/debian/patches/post-9beta2/0031-configure-recognise-more-sparc-variants-as-cpu-argum.patch
+++ b/debian/patches/post-9beta2/0031-configure-recognise-more-sparc-variants-as-cpu-argum.patch
@@ -1,7 +1,7 @@
 From eadfb0560a2f194fbc453bcb22fea73f3c9a27ad Mon Sep 17 00:00:00 2001
 From: Michael Kostylev <michael.kostylev at gmail.com>
 Date: Thu, 25 Oct 2012 11:38:51 +0100
-Subject: [PATCH 031/204] configure: recognise more sparc variants as --cpu
+Subject: [PATCH 031/278] configure: recognise more sparc variants as --cpu
  argument
 
 Signed-off-by: Mans Rullgard <mans at mansr.com>
diff --git a/debian/patches/post-9beta2/0032-configure-sanitise-sparc-vis-check.patch b/debian/patches/post-9beta2/0032-configure-sanitise-sparc-vis-check.patch
index 7a47be7..7de3c2c 100644
--- a/debian/patches/post-9beta2/0032-configure-sanitise-sparc-vis-check.patch
+++ b/debian/patches/post-9beta2/0032-configure-sanitise-sparc-vis-check.patch
@@ -1,7 +1,7 @@
 From 6aa93689abe8c095cec9fa828c2dee3131008995 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans at mansr.com>
 Date: Thu, 25 Oct 2012 15:56:16 +0100
-Subject: [PATCH 032/204] configure: sanitise sparc vis check
+Subject: [PATCH 032/278] configure: sanitise sparc vis check
 
 It is wrong to force -mcpu=ultrasparc when checking for vis.
 
diff --git a/debian/patches/post-9beta2/0033-h263-avoid-memcpys-over-array-bound-in-motion-vector.patch b/debian/patches/post-9beta2/0033-h263-avoid-memcpys-over-array-bound-in-motion-vector.patch
index 1d2aa52..7385bf9 100644
--- a/debian/patches/post-9beta2/0033-h263-avoid-memcpys-over-array-bound-in-motion-vector.patch
+++ b/debian/patches/post-9beta2/0033-h263-avoid-memcpys-over-array-bound-in-motion-vector.patch
@@ -1,7 +1,7 @@
 From 154ff81870ce9838eaa87b19d0f5ecceb9dd514e Mon Sep 17 00:00:00 2001
 From: Janne Grunau <janne-libav at jannau.net>
 Date: Wed, 10 Oct 2012 14:25:44 +0200
-Subject: [PATCH 033/204] h263: avoid memcpys over array bound in motion
+Subject: [PATCH 033/278] h263: avoid memcpys over array bound in motion
  vector caching for obmc
 
 Fixes CID602232.
diff --git a/debian/patches/post-9beta2/0034-doxygen-Drop-some-pointless-entries-from-PREDEFINED-.patch b/debian/patches/post-9beta2/0034-doxygen-Drop-some-pointless-entries-from-PREDEFINED-.patch
index c551e1b..f350b80 100644
--- a/debian/patches/post-9beta2/0034-doxygen-Drop-some-pointless-entries-from-PREDEFINED-.patch
+++ b/debian/patches/post-9beta2/0034-doxygen-Drop-some-pointless-entries-from-PREDEFINED-.patch
@@ -1,7 +1,7 @@
 From 74e742d6ad09becc2d43e5382c141e0356ad6071 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Tue, 23 Oct 2012 21:12:48 +0200
-Subject: [PATCH 034/204] doxygen: Drop some pointless entries from PREDEFINED
+Subject: [PATCH 034/278] doxygen: Drop some pointless entries from PREDEFINED
  macros list
 
 ---
diff --git a/debian/patches/post-9beta2/0035-doxygen-Add-av_alloc_size-to-list-of-predefined-macr.patch b/debian/patches/post-9beta2/0035-doxygen-Add-av_alloc_size-to-list-of-predefined-macr.patch
index e3ae494..c670599 100644
--- a/debian/patches/post-9beta2/0035-doxygen-Add-av_alloc_size-to-list-of-predefined-macr.patch
+++ b/debian/patches/post-9beta2/0035-doxygen-Add-av_alloc_size-to-list-of-predefined-macr.patch
@@ -1,7 +1,7 @@
 From 13bbefd57e8dcabae650f4a02e667d5c003c289f Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Mon, 22 Oct 2012 16:16:07 +0200
-Subject: [PATCH 035/204] doxygen: Add av_alloc_size to list of predefined
+Subject: [PATCH 035/278] doxygen: Add av_alloc_size to list of predefined
  macros
 
 This avoids Doxygen believing the attribute is the function name.
diff --git a/debian/patches/post-9beta2/0036-cook-cosmetics-Better-name-for-ccpl-COOKSubpacket-me.patch b/debian/patches/post-9beta2/0036-cook-cosmetics-Better-name-for-ccpl-COOKSubpacket-me.patch
index cc6f2dd..64b7235 100644
--- a/debian/patches/post-9beta2/0036-cook-cosmetics-Better-name-for-ccpl-COOKSubpacket-me.patch
+++ b/debian/patches/post-9beta2/0036-cook-cosmetics-Better-name-for-ccpl-COOKSubpacket-me.patch
@@ -1,7 +1,7 @@
 From 20015379a46a3b261f57b0daf0c7237b62c1fd82 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Wed, 24 Oct 2012 01:05:04 +0200
-Subject: [PATCH 036/204] cook: cosmetics: Better name for ccpl COOKSubpacket
+Subject: [PATCH 036/278] cook: cosmetics: Better name for ccpl COOKSubpacket
  member
 
 ---
diff --git a/debian/patches/post-9beta2/0037-cook-cosmetics-Better-names-for-joint_decode-functio.patch b/debian/patches/post-9beta2/0037-cook-cosmetics-Better-names-for-joint_decode-functio.patch
index 620cde7..45fb152 100644
--- a/debian/patches/post-9beta2/0037-cook-cosmetics-Better-names-for-joint_decode-functio.patch
+++ b/debian/patches/post-9beta2/0037-cook-cosmetics-Better-names-for-joint_decode-functio.patch
@@ -1,7 +1,7 @@
 From f23b4a068230fb4ebed2449cd5f303f3b16d333d Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Wed, 24 Oct 2012 01:08:19 +0200
-Subject: [PATCH 037/204] cook: cosmetics: Better names for joint_decode()
+Subject: [PATCH 037/278] cook: cosmetics: Better names for joint_decode()
  function parameters
 
 ---
diff --git a/debian/patches/post-9beta2/0038-cook-Remove-senseless-maybe_reformat_buffer32-functi.patch b/debian/patches/post-9beta2/0038-cook-Remove-senseless-maybe_reformat_buffer32-functi.patch
index cf21596..3a72392 100644
--- a/debian/patches/post-9beta2/0038-cook-Remove-senseless-maybe_reformat_buffer32-functi.patch
+++ b/debian/patches/post-9beta2/0038-cook-Remove-senseless-maybe_reformat_buffer32-functi.patch
@@ -1,7 +1,7 @@
 From 8a61ba0e8194beffdfd9f843bdcf29dbbc974ca5 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Wed, 24 Oct 2012 16:03:31 +0200
-Subject: [PATCH 038/204] cook: Remove senseless maybe_reformat_buffer32()
+Subject: [PATCH 038/278] cook: Remove senseless maybe_reformat_buffer32()
  function
 
 ---
diff --git a/debian/patches/post-9beta2/0039-cook-Remove-some-silly-Doxygen-comments.patch b/debian/patches/post-9beta2/0039-cook-Remove-some-silly-Doxygen-comments.patch
index 11d4001..0fc1dea 100644
--- a/debian/patches/post-9beta2/0039-cook-Remove-some-silly-Doxygen-comments.patch
+++ b/debian/patches/post-9beta2/0039-cook-Remove-some-silly-Doxygen-comments.patch
@@ -1,7 +1,7 @@
 From 707f58f515eeb282563af3c443cac10c2d3e81b4 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Wed, 24 Oct 2012 19:00:33 +0200
-Subject: [PATCH 039/204] cook: Remove some silly Doxygen comments
+Subject: [PATCH 039/278] cook: Remove some silly Doxygen comments
 
 ---
  libavcodec/cook.c |   19 ++-----------------
diff --git a/debian/patches/post-9beta2/0040-ivi_common-Drop-unused-function-parameter-from-decod.patch b/debian/patches/post-9beta2/0040-ivi_common-Drop-unused-function-parameter-from-decod.patch
index 59007aa..371a3ee 100644
--- a/debian/patches/post-9beta2/0040-ivi_common-Drop-unused-function-parameter-from-decod.patch
+++ b/debian/patches/post-9beta2/0040-ivi_common-Drop-unused-function-parameter-from-decod.patch
@@ -1,7 +1,7 @@
 From 87cdd7c6949e0166a22b558e0657ac277c95d452 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Wed, 24 Oct 2012 11:54:03 +0200
-Subject: [PATCH 040/204] ivi_common: Drop unused function parameter from
+Subject: [PATCH 040/278] ivi_common: Drop unused function parameter from
  decode_band()
 
 ---
diff --git a/debian/patches/post-9beta2/0041-doc-git-howto-Clarify-comment-about-pushing-series-o.patch b/debian/patches/post-9beta2/0041-doc-git-howto-Clarify-comment-about-pushing-series-o.patch
index 35adca9..840d939 100644
--- a/debian/patches/post-9beta2/0041-doc-git-howto-Clarify-comment-about-pushing-series-o.patch
+++ b/debian/patches/post-9beta2/0041-doc-git-howto-Clarify-comment-about-pushing-series-o.patch
@@ -1,7 +1,7 @@
 From ca7f59119b8a53d60418c4adccb0c46922795f79 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Thu, 25 Oct 2012 18:25:25 +0200
-Subject: [PATCH 041/204] doc: git-howto: Clarify comment about pushing series
+Subject: [PATCH 041/278] doc: git-howto: Clarify comment about pushing series
  of commits
 
 ---
diff --git a/debian/patches/post-9beta2/0042-configure-fix-tests-for-2-arg-math-functions.patch b/debian/patches/post-9beta2/0042-configure-fix-tests-for-2-arg-math-functions.patch
index 7e6becd..b277772 100644
--- a/debian/patches/post-9beta2/0042-configure-fix-tests-for-2-arg-math-functions.patch
+++ b/debian/patches/post-9beta2/0042-configure-fix-tests-for-2-arg-math-functions.patch
@@ -1,7 +1,7 @@
 From 1aa07aa21c4ee39f0ed5fcd33d8259eed74bd3ab Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans at mansr.com>
 Date: Fri, 26 Oct 2012 14:42:47 +0100
-Subject: [PATCH 042/204] configure: fix tests for 2-arg math functions
+Subject: [PATCH 042/278] configure: fix tests for 2-arg math functions
 
 Signed-off-by: Mans Rullgard <mans at mansr.com>
 ---
diff --git a/debian/patches/post-9beta2/0043-buffersink-remove-stray-semicolon-after-function-def.patch b/debian/patches/post-9beta2/0043-buffersink-remove-stray-semicolon-after-function-def.patch
index 4a80240..238023a 100644
--- a/debian/patches/post-9beta2/0043-buffersink-remove-stray-semicolon-after-function-def.patch
+++ b/debian/patches/post-9beta2/0043-buffersink-remove-stray-semicolon-after-function-def.patch
@@ -1,7 +1,7 @@
 From 6b776c61da26428ca67abec919c8a186a276ca66 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans at mansr.com>
 Date: Fri, 26 Oct 2012 17:58:19 +0100
-Subject: [PATCH 043/204] buffersink: remove stray semicolon after function
+Subject: [PATCH 043/278] buffersink: remove stray semicolon after function
  definition
 
 Signed-off-by: Mans Rullgard <mans at mansr.com>
diff --git a/debian/patches/post-9beta2/0044-af_channelmap-remove-stray-enum-declaration.patch b/debian/patches/post-9beta2/0044-af_channelmap-remove-stray-enum-declaration.patch
index d279057..106f7ac 100644
--- a/debian/patches/post-9beta2/0044-af_channelmap-remove-stray-enum-declaration.patch
+++ b/debian/patches/post-9beta2/0044-af_channelmap-remove-stray-enum-declaration.patch
@@ -1,7 +1,7 @@
 From 67a68dcec2271336c859d1fbd8f40c268f54ec8a Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans at mansr.com>
 Date: Fri, 26 Oct 2012 22:25:37 +0100
-Subject: [PATCH 044/204] af_channelmap: remove stray enum declaration
+Subject: [PATCH 044/278] af_channelmap: remove stray enum declaration
 
 Signed-off-by: Mans Rullgard <mans at mansr.com>
 ---
diff --git a/debian/patches/post-9beta2/0045-network-use-HAVE_THREADS-instead-of-local-hack.patch b/debian/patches/post-9beta2/0045-network-use-HAVE_THREADS-instead-of-local-hack.patch
index 412385d..551eb13 100644
--- a/debian/patches/post-9beta2/0045-network-use-HAVE_THREADS-instead-of-local-hack.patch
+++ b/debian/patches/post-9beta2/0045-network-use-HAVE_THREADS-instead-of-local-hack.patch
@@ -1,7 +1,7 @@
 From 9efbfe57e082b0f42bf0c830a4fdc6b80d2b13ca Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans at mansr.com>
 Date: Fri, 26 Oct 2012 19:33:59 +0100
-Subject: [PATCH 045/204] network: use HAVE_THREADS instead of local hack
+Subject: [PATCH 045/278] network: use HAVE_THREADS instead of local hack
 
 HAVE_THREADS is set in config.h if pthreads or w32threads is
 available, which presumably the proper condition here.
diff --git a/debian/patches/post-9beta2/0046-udp-use-socklen_t-where-appropriate.patch b/debian/patches/post-9beta2/0046-udp-use-socklen_t-where-appropriate.patch
index 05f4b4c..b0555e6 100644
--- a/debian/patches/post-9beta2/0046-udp-use-socklen_t-where-appropriate.patch
+++ b/debian/patches/post-9beta2/0046-udp-use-socklen_t-where-appropriate.patch
@@ -1,7 +1,7 @@
 From be2efe0c7b6a8188988d7de5da236d794312b5bb Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans at mansr.com>
 Date: Fri, 26 Oct 2012 19:46:37 +0100
-Subject: [PATCH 046/204] udp: use socklen_t where appropriate
+Subject: [PATCH 046/278] udp: use socklen_t where appropriate
 
 getsockname() takes a pointer to socklen_t which is not necessarily
 int.
diff --git a/debian/patches/post-9beta2/0047-avserver-use-socklen_t-where-appropriate.patch b/debian/patches/post-9beta2/0047-avserver-use-socklen_t-where-appropriate.patch
index d1d6ccc..23af001 100644
--- a/debian/patches/post-9beta2/0047-avserver-use-socklen_t-where-appropriate.patch
+++ b/debian/patches/post-9beta2/0047-avserver-use-socklen_t-where-appropriate.patch
@@ -1,7 +1,7 @@
 From cc64ec570c92fe39db3f1db8c877a8cc70e3b668 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans at mansr.com>
 Date: Fri, 26 Oct 2012 21:53:31 +0100
-Subject: [PATCH 047/204] avserver: use socklen_t where appropriate
+Subject: [PATCH 047/278] avserver: use socklen_t where appropriate
 
 Various socket functions expect a pointer to socklen_t which is not
 necessarily int.
diff --git a/debian/patches/post-9beta2/0048-avio-fix-pointer-type-mismatches-in-avio_enum_protoc.patch b/debian/patches/post-9beta2/0048-avio-fix-pointer-type-mismatches-in-avio_enum_protoc.patch
index 8214c90..40364fc 100644
--- a/debian/patches/post-9beta2/0048-avio-fix-pointer-type-mismatches-in-avio_enum_protoc.patch
+++ b/debian/patches/post-9beta2/0048-avio-fix-pointer-type-mismatches-in-avio_enum_protoc.patch
@@ -1,7 +1,7 @@
 From 4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans at mansr.com>
 Date: Fri, 26 Oct 2012 18:42:29 +0100
-Subject: [PATCH 048/204] avio: fix pointer type mismatches in
+Subject: [PATCH 048/278] avio: fix pointer type mismatches in
  avio_enum_protocols()
 
 Signed-off-by: Mans Rullgard <mans at mansr.com>
diff --git a/debian/patches/post-9beta2/0049-amrwbdec-fix-invalid-pointer-arithmetic.patch b/debian/patches/post-9beta2/0049-amrwbdec-fix-invalid-pointer-arithmetic.patch
index 7110f4a..7dd7d96 100644
--- a/debian/patches/post-9beta2/0049-amrwbdec-fix-invalid-pointer-arithmetic.patch
+++ b/debian/patches/post-9beta2/0049-amrwbdec-fix-invalid-pointer-arithmetic.patch
@@ -1,7 +1,7 @@
 From 50be207759aa7a69a27de585f7d870ec41eba036 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans at mansr.com>
 Date: Fri, 26 Oct 2012 22:44:38 +0100
-Subject: [PATCH 049/204] amrwbdec: fix invalid pointer arithmetic
+Subject: [PATCH 049/278] amrwbdec: fix invalid pointer arithmetic
 
 Subtracting a (positive) value from the address of an array violates
 C99 section 6.5.6:
diff --git a/debian/patches/post-9beta2/0050-h264-fix-invalid-pointer-arithmetic.patch b/debian/patches/post-9beta2/0050-h264-fix-invalid-pointer-arithmetic.patch
index 985ac7b..d93297a 100644
--- a/debian/patches/post-9beta2/0050-h264-fix-invalid-pointer-arithmetic.patch
+++ b/debian/patches/post-9beta2/0050-h264-fix-invalid-pointer-arithmetic.patch
@@ -1,7 +1,7 @@
 From c4cccc8d3f6605c5fdd73723a865486c5b7fb117 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans at mansr.com>
 Date: Fri, 26 Oct 2012 21:18:33 +0100
-Subject: [PATCH 050/204] h264: fix invalid pointer arithmetic
+Subject: [PATCH 050/278] h264: fix invalid pointer arithmetic
 
 Subtracting a (positive) value from the address of an array violates
 C99 section 6.5.6:
diff --git a/debian/patches/post-9beta2/0051-vp8-fix-memset-crossing-array-boundary.patch b/debian/patches/post-9beta2/0051-vp8-fix-memset-crossing-array-boundary.patch
index 2a08816..49f1d4e 100644
--- a/debian/patches/post-9beta2/0051-vp8-fix-memset-crossing-array-boundary.patch
+++ b/debian/patches/post-9beta2/0051-vp8-fix-memset-crossing-array-boundary.patch
@@ -1,7 +1,7 @@
 From 4471a2420717d8dc10b573cca50292d0d598d925 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans at mansr.com>
 Date: Fri, 26 Oct 2012 21:43:55 +0100
-Subject: [PATCH 051/204] vp8: fix memset() crossing array boundary
+Subject: [PATCH 051/278] vp8: fix memset() crossing array boundary
 
 Indexing across array boundaries is not allowed by C99.
 
diff --git a/debian/patches/post-9beta2/0052-configure-detect-sparc64-automatically.patch b/debian/patches/post-9beta2/0052-configure-detect-sparc64-automatically.patch
index 9383ccc..545644f 100644
--- a/debian/patches/post-9beta2/0052-configure-detect-sparc64-automatically.patch
+++ b/debian/patches/post-9beta2/0052-configure-detect-sparc64-automatically.patch
@@ -1,7 +1,7 @@
 From 4cd217c065e948a9cec38fef9c544d3c26ff8f37 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans at mansr.com>
 Date: Wed, 24 Oct 2012 18:34:21 +0100
-Subject: [PATCH 052/204] configure: detect sparc64 automatically
+Subject: [PATCH 052/278] configure: detect sparc64 automatically
 
 Signed-off-by: Mans Rullgard <mans at mansr.com>
 ---
diff --git a/debian/patches/post-9beta2/0053-assdec-fix-qsort-callback-signature.patch b/debian/patches/post-9beta2/0053-assdec-fix-qsort-callback-signature.patch
index f531ac6..60b293b 100644
--- a/debian/patches/post-9beta2/0053-assdec-fix-qsort-callback-signature.patch
+++ b/debian/patches/post-9beta2/0053-assdec-fix-qsort-callback-signature.patch
@@ -1,7 +1,7 @@
 From 4cbae57cef65df8705b77cf882372f835a42d842 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans at mansr.com>
 Date: Fri, 26 Oct 2012 17:59:50 +0100
-Subject: [PATCH 053/204] assdec: fix qsort() callback signature
+Subject: [PATCH 053/278] assdec: fix qsort() callback signature
 
 This changes the event_cmp() function to the correct signature,
 avoiding an ugly cast.
diff --git a/debian/patches/post-9beta2/0054-nutenc-K-R-formatting-cosmetics.patch b/debian/patches/post-9beta2/0054-nutenc-K-R-formatting-cosmetics.patch
index 0998120..ffb1152 100644
--- a/debian/patches/post-9beta2/0054-nutenc-K-R-formatting-cosmetics.patch
+++ b/debian/patches/post-9beta2/0054-nutenc-K-R-formatting-cosmetics.patch
@@ -1,7 +1,7 @@
 From fce4450dec2f1287124a5c129281100f729f5771 Mon Sep 17 00:00:00 2001
 From: Luca Barbato <lu_zero at gentoo.org>
 Date: Sat, 27 Oct 2012 00:41:02 +0200
-Subject: [PATCH 054/204] nutenc: K&R formatting cosmetics
+Subject: [PATCH 054/278] nutenc: K&R formatting cosmetics
 
 ---
  libavformat/nutenc.c |  753 +++++++++++++++++++++++++++-----------------------
diff --git a/debian/patches/post-9beta2/0055-yuv4mpeg-reject-unsupported-codecs.patch b/debian/patches/post-9beta2/0055-yuv4mpeg-reject-unsupported-codecs.patch
index 1274fa9..b6066d1 100644
--- a/debian/patches/post-9beta2/0055-yuv4mpeg-reject-unsupported-codecs.patch
+++ b/debian/patches/post-9beta2/0055-yuv4mpeg-reject-unsupported-codecs.patch
@@ -1,7 +1,7 @@
 From 424b1e764263b1493de4c34365ef367ddae856db Mon Sep 17 00:00:00 2001
 From: Luca Barbato <lu_zero at gentoo.org>
 Date: Fri, 26 Oct 2012 22:55:04 +0200
-Subject: [PATCH 055/204] yuv4mpeg: reject unsupported codecs
+Subject: [PATCH 055/278] yuv4mpeg: reject unsupported codecs
 
 The muxer already rejects unsupported pixel formats, reject also
 unsupported codecs to prevent dangerous misuses.
diff --git a/debian/patches/post-9beta2/0056-rtpdec-Cosmetic-cleanup.patch b/debian/patches/post-9beta2/0056-rtpdec-Cosmetic-cleanup.patch
index cacc333..7cf42ff 100644
--- a/debian/patches/post-9beta2/0056-rtpdec-Cosmetic-cleanup.patch
+++ b/debian/patches/post-9beta2/0056-rtpdec-Cosmetic-cleanup.patch
@@ -1,7 +1,7 @@
 From 48f01398ba30d8d921b27558df0029033e2d4402 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
 Date: Mon, 22 Oct 2012 15:54:25 +0300
-Subject: [PATCH 056/204] rtpdec: Cosmetic cleanup
+Subject: [PATCH 056/278] rtpdec: Cosmetic cleanup
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/debian/patches/post-9beta2/0057-lavc-add-CODEC_CAP_DR1-to-all-video-decoders-missing.patch b/debian/patches/post-9beta2/0057-lavc-add-CODEC_CAP_DR1-to-all-video-decoders-missing.patch
index d6a8e92..dd0484e 100644
--- a/debian/patches/post-9beta2/0057-lavc-add-CODEC_CAP_DR1-to-all-video-decoders-missing.patch
+++ b/debian/patches/post-9beta2/0057-lavc-add-CODEC_CAP_DR1-to-all-video-decoders-missing.patch
@@ -1,7 +1,7 @@
 From f174fbac3cb127273b8f3df8e05d7156ec1d7658 Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Wed, 17 Oct 2012 21:39:04 +0200
-Subject: [PATCH 057/204] lavc: add CODEC_CAP_DR1 to all video decoders
+Subject: [PATCH 057/278] lavc: add CODEC_CAP_DR1 to all video decoders
  missing them
 
 ---
diff --git a/debian/patches/post-9beta2/0058-nutenc-verbosely-report-unsupported-negative-pts.patch b/debian/patches/post-9beta2/0058-nutenc-verbosely-report-unsupported-negative-pts.patch
index 24b9478..c38ee58 100644
--- a/debian/patches/post-9beta2/0058-nutenc-verbosely-report-unsupported-negative-pts.patch
+++ b/debian/patches/post-9beta2/0058-nutenc-verbosely-report-unsupported-negative-pts.patch
@@ -1,7 +1,7 @@
 From 07585ffa62eebebcd35326935fec7cd948021daf Mon Sep 17 00:00:00 2001
 From: Luca Barbato <lu_zero at gentoo.org>
 Date: Sat, 27 Oct 2012 16:56:37 +0200
-Subject: [PATCH 058/204] nutenc: verbosely report unsupported negative pts
+Subject: [PATCH 058/278] nutenc: verbosely report unsupported negative pts
 
 Additionally use the correct error number.
 ---
diff --git a/debian/patches/post-9beta2/0059-nut-support-textual-data.patch b/debian/patches/post-9beta2/0059-nut-support-textual-data.patch
index 21d75ac..c68cc52 100644
--- a/debian/patches/post-9beta2/0059-nut-support-textual-data.patch
+++ b/debian/patches/post-9beta2/0059-nut-support-textual-data.patch
@@ -1,7 +1,7 @@
 From d4bff9f1ab59f4ae58841bd7b056f2ff1b8854d7 Mon Sep 17 00:00:00 2001
 From: Luca Barbato <lu_zero at gentoo.org>
 Date: Thu, 25 Oct 2012 14:05:40 +0200
-Subject: [PATCH 059/204] nut: support textual data
+Subject: [PATCH 059/278] nut: support textual data
 
 Plain text (utf8 encoded) data can be muxed and demuxed in nut.
 ---
diff --git a/debian/patches/post-9beta2/0060-rtsp-Avoid-a-cast-when-calling-strtol.patch b/debian/patches/post-9beta2/0060-rtsp-Avoid-a-cast-when-calling-strtol.patch
index 21b4dab..ea371f2 100644
--- a/debian/patches/post-9beta2/0060-rtsp-Avoid-a-cast-when-calling-strtol.patch
+++ b/debian/patches/post-9beta2/0060-rtsp-Avoid-a-cast-when-calling-strtol.patch
@@ -1,7 +1,7 @@
 From f21d5c905dd5c6a56583c85623a376a029ec041a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
 Date: Mon, 22 Oct 2012 23:13:49 +0300
-Subject: [PATCH 060/204] rtsp: Avoid a cast when calling strtol
+Subject: [PATCH 060/278] rtsp: Avoid a cast when calling strtol
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/debian/patches/post-9beta2/0061-aacenc-Drop-some-unused-function-arguments.patch b/debian/patches/post-9beta2/0061-aacenc-Drop-some-unused-function-arguments.patch
index 13de7c3..ebf09d2 100644
--- a/debian/patches/post-9beta2/0061-aacenc-Drop-some-unused-function-arguments.patch
+++ b/debian/patches/post-9beta2/0061-aacenc-Drop-some-unused-function-arguments.patch
@@ -1,7 +1,7 @@
 From 72c758f1fd06e812a2075bae836ec18891d99852 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Wed, 24 Oct 2012 19:16:08 +0200
-Subject: [PATCH 061/204] aacenc: Drop some unused function arguments
+Subject: [PATCH 061/278] aacenc: Drop some unused function arguments
 
 ---
  libavcodec/aacenc.c |    9 ++++-----
diff --git a/debian/patches/post-9beta2/0062-cmdutils-Conditionally-compile-libswscale-related-bi.patch b/debian/patches/post-9beta2/0062-cmdutils-Conditionally-compile-libswscale-related-bi.patch
index 9109724..5a99b1b 100644
--- a/debian/patches/post-9beta2/0062-cmdutils-Conditionally-compile-libswscale-related-bi.patch
+++ b/debian/patches/post-9beta2/0062-cmdutils-Conditionally-compile-libswscale-related-bi.patch
@@ -1,7 +1,7 @@
 From ab799664755c8bc2c439c428ff5b538c105a5c38 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Mon, 29 Oct 2012 18:00:14 +0100
-Subject: [PATCH 062/204] cmdutils: Conditionally compile libswscale-related
+Subject: [PATCH 062/278] cmdutils: Conditionally compile libswscale-related
  bits
 
 This fixes compilation with libswscale disabled.
diff --git a/debian/patches/post-9beta2/0063-avconv-Drop-unused-function-argument-from-do_video_s.patch b/debian/patches/post-9beta2/0063-avconv-Drop-unused-function-argument-from-do_video_s.patch
index 0c539f0..38c2cb0 100644
--- a/debian/patches/post-9beta2/0063-avconv-Drop-unused-function-argument-from-do_video_s.patch
+++ b/debian/patches/post-9beta2/0063-avconv-Drop-unused-function-argument-from-do_video_s.patch
@@ -1,7 +1,7 @@
 From 70478746a94eba6467c02f1c2ae8d8090ad9168e Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Wed, 24 Oct 2012 19:18:12 +0200
-Subject: [PATCH 063/204] avconv: Drop unused function argument from
+Subject: [PATCH 063/278] avconv: Drop unused function argument from
  do_video_stats()
 
 ---
diff --git a/debian/patches/post-9beta2/0064-fate-Add-shorthands-for-acodec-PCM-and-ADPCM-tests.patch b/debian/patches/post-9beta2/0064-fate-Add-shorthands-for-acodec-PCM-and-ADPCM-tests.patch
index 77e9b78..1576f5b 100644
--- a/debian/patches/post-9beta2/0064-fate-Add-shorthands-for-acodec-PCM-and-ADPCM-tests.patch
+++ b/debian/patches/post-9beta2/0064-fate-Add-shorthands-for-acodec-PCM-and-ADPCM-tests.patch
@@ -1,7 +1,7 @@
 From e519990ced06467ea3be249d0267205758a375eb Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Wed, 17 Oct 2012 19:47:03 +0200
-Subject: [PATCH 064/204] fate: Add shorthands for acodec PCM and ADPCM tests
+Subject: [PATCH 064/278] fate: Add shorthands for acodec PCM and ADPCM tests
 
 ---
  tests/fate/acodec.mak |    8 ++++++--
diff --git a/debian/patches/post-9beta2/0065-fate-ac3-Place-E-AC-3-tests-and-AC-3-tests-in-differ.patch b/debian/patches/post-9beta2/0065-fate-ac3-Place-E-AC-3-tests-and-AC-3-tests-in-differ.patch
index 4670890..9059b52 100644
--- a/debian/patches/post-9beta2/0065-fate-ac3-Place-E-AC-3-tests-and-AC-3-tests-in-differ.patch
+++ b/debian/patches/post-9beta2/0065-fate-ac3-Place-E-AC-3-tests-and-AC-3-tests-in-differ.patch
@@ -1,7 +1,7 @@
 From 381dc1a5ec0925b281c573457c413ae643567086 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Sat, 20 Oct 2012 00:14:26 +0200
-Subject: [PATCH 065/204] fate: ac3: Place E-AC-3 tests and AC-3 tests in
+Subject: [PATCH 065/278] fate: ac3: Place E-AC-3 tests and AC-3 tests in
  different groups
 
 ---
diff --git a/debian/patches/post-9beta2/0066-fate-ac3-Add-dependencies.patch b/debian/patches/post-9beta2/0066-fate-ac3-Add-dependencies.patch
index 94179f0..36ab94c 100644
--- a/debian/patches/post-9beta2/0066-fate-ac3-Add-dependencies.patch
+++ b/debian/patches/post-9beta2/0066-fate-ac3-Add-dependencies.patch
@@ -1,7 +1,7 @@
 From 2cbdd7c92958cb8226491d8eb23ed2d57d4b841e Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Sat, 20 Oct 2012 01:13:39 +0200
-Subject: [PATCH 066/204] fate: ac3: Add dependencies
+Subject: [PATCH 066/278] fate: ac3: Add dependencies
 
 ---
  tests/fate/ac3.mak |   15 ++++++++-------
diff --git a/debian/patches/post-9beta2/0067-indeo3-remove-duplicate-capabilities-line.patch b/debian/patches/post-9beta2/0067-indeo3-remove-duplicate-capabilities-line.patch
index 27629d1..e78c5a1 100644
--- a/debian/patches/post-9beta2/0067-indeo3-remove-duplicate-capabilities-line.patch
+++ b/debian/patches/post-9beta2/0067-indeo3-remove-duplicate-capabilities-line.patch
@@ -1,7 +1,7 @@
 From bff5e5f8b3c5892a21a0df7b3352b31511e42a94 Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Mon, 29 Oct 2012 12:16:05 +0100
-Subject: [PATCH 067/204] indeo3: remove duplicate capabilities line.
+Subject: [PATCH 067/278] indeo3: remove duplicate capabilities line.
 
 ---
  libavcodec/indeo3.c |    1 -
diff --git a/debian/patches/post-9beta2/0068-lavr-add-general-API-usage-doxy.patch b/debian/patches/post-9beta2/0068-lavr-add-general-API-usage-doxy.patch
index 05802f2..ff34582 100644
--- a/debian/patches/post-9beta2/0068-lavr-add-general-API-usage-doxy.patch
+++ b/debian/patches/post-9beta2/0068-lavr-add-general-API-usage-doxy.patch
@@ -1,7 +1,7 @@
 From 01b760190d32550683d7c790309acadea3fe0820 Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Sun, 28 Oct 2012 22:52:54 +0100
-Subject: [PATCH 068/204] lavr: add general API usage doxy
+Subject: [PATCH 068/278] lavr: add general API usage doxy
 
 Signed-off-by: Anton Khirnov <anton at khirnov.net>
 ---
diff --git a/debian/patches/post-9beta2/0069-lavr-document-upper-bound-on-number-of-output-sample.patch b/debian/patches/post-9beta2/0069-lavr-document-upper-bound-on-number-of-output-sample.patch
index c352dc1..e728519 100644
--- a/debian/patches/post-9beta2/0069-lavr-document-upper-bound-on-number-of-output-sample.patch
+++ b/debian/patches/post-9beta2/0069-lavr-document-upper-bound-on-number-of-output-sample.patch
@@ -1,7 +1,7 @@
 From dc5793062e7a0f6d195fc403d7ce242729b4ea4a Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Sun, 28 Oct 2012 22:52:55 +0100
-Subject: [PATCH 069/204] lavr: document upper bound on number of output
+Subject: [PATCH 069/278] lavr: document upper bound on number of output
  samples.
 
 Signed-off-by: Anton Khirnov <anton at khirnov.net>
diff --git a/debian/patches/post-9beta2/0070-lpc-Add-a-function-for-calculating-reflection-coeffi.patch b/debian/patches/post-9beta2/0070-lpc-Add-a-function-for-calculating-reflection-coeffi.patch
index 8e16eda..f418300 100644
--- a/debian/patches/post-9beta2/0070-lpc-Add-a-function-for-calculating-reflection-coeffi.patch
+++ b/debian/patches/post-9beta2/0070-lpc-Add-a-function-for-calculating-reflection-coeffi.patch
@@ -1,7 +1,7 @@
 From 39ef66f5300c2a42acc29937f5417bc2efe09752 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Sat, 27 Oct 2012 22:29:56 +0300
-Subject: [PATCH 070/204] lpc: Add a function for calculating reflection
+Subject: [PATCH 070/278] lpc: Add a function for calculating reflection
  coefficients from autocorrelation coefficients
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
diff --git a/debian/patches/post-9beta2/0071-lpc-Add-a-function-for-calculating-reflection-coeffi.patch b/debian/patches/post-9beta2/0071-lpc-Add-a-function-for-calculating-reflection-coeffi.patch
index 30182e8..9a46fce 100644
--- a/debian/patches/post-9beta2/0071-lpc-Add-a-function-for-calculating-reflection-coeffi.patch
+++ b/debian/patches/post-9beta2/0071-lpc-Add-a-function-for-calculating-reflection-coeffi.patch
@@ -1,7 +1,7 @@
 From 8b25a20efbf4ca261bcd3327a385330eca775ec6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
 Date: Thu, 25 Oct 2012 15:33:15 +0300
-Subject: [PATCH 071/204] lpc: Add a function for calculating reflection
+Subject: [PATCH 071/278] lpc: Add a function for calculating reflection
  coefficients from samples
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
diff --git a/debian/patches/post-9beta2/0072-avcodec-Add-a-RFC-3389-comfort-noise-codec.patch b/debian/patches/post-9beta2/0072-avcodec-Add-a-RFC-3389-comfort-noise-codec.patch
index 8fea7fd..c2766f0 100644
--- a/debian/patches/post-9beta2/0072-avcodec-Add-a-RFC-3389-comfort-noise-codec.patch
+++ b/debian/patches/post-9beta2/0072-avcodec-Add-a-RFC-3389-comfort-noise-codec.patch
@@ -1,7 +1,7 @@
 From 9b500b8f6c9806f3979f9d1fb874b7f4a802c656 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
 Date: Tue, 23 Oct 2012 00:02:41 +0300
-Subject: [PATCH 072/204] avcodec: Add a RFC 3389 comfort noise codec
+Subject: [PATCH 072/278] avcodec: Add a RFC 3389 comfort noise codec
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/debian/patches/post-9beta2/0073-lavfi-add-ashowinfo-filter.patch b/debian/patches/post-9beta2/0073-lavfi-add-ashowinfo-filter.patch
index be753e7..9dbc6b4 100644
--- a/debian/patches/post-9beta2/0073-lavfi-add-ashowinfo-filter.patch
+++ b/debian/patches/post-9beta2/0073-lavfi-add-ashowinfo-filter.patch
@@ -1,7 +1,7 @@
 From 20dd41af8513de427b00ee598339c9bc5778bdc5 Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Tue, 23 Oct 2012 21:37:26 +0200
-Subject: [PATCH 073/204] lavfi: add ashowinfo filter
+Subject: [PATCH 073/278] lavfi: add ashowinfo filter
 
 It can be useful for debugging.
 
diff --git a/debian/patches/post-9beta2/0074-dv-use-AVStream.index-instead-of-abusing-AVStream.id.patch b/debian/patches/post-9beta2/0074-dv-use-AVStream.index-instead-of-abusing-AVStream.id.patch
index b951fb4..ec10376 100644
--- a/debian/patches/post-9beta2/0074-dv-use-AVStream.index-instead-of-abusing-AVStream.id.patch
+++ b/debian/patches/post-9beta2/0074-dv-use-AVStream.index-instead-of-abusing-AVStream.id.patch
@@ -1,7 +1,7 @@
 From 14f031d7ecfabba0ef02776d4516aa3dcb7c40d8 Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Wed, 24 Oct 2012 09:06:32 +0200
-Subject: [PATCH 074/204] dv: use AVStream.index instead of abusing
+Subject: [PATCH 074/278] dv: use AVStream.index instead of abusing
  AVStream.id
 
 ---
diff --git a/debian/patches/post-9beta2/0075-dv-fix-indentation.patch b/debian/patches/post-9beta2/0075-dv-fix-indentation.patch
index 5356d4b..cfb4256 100644
--- a/debian/patches/post-9beta2/0075-dv-fix-indentation.patch
+++ b/debian/patches/post-9beta2/0075-dv-fix-indentation.patch
@@ -1,7 +1,7 @@
 From ede4cedf47f4f0ad26d61d28aa0ae2917c0c833e Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Wed, 24 Oct 2012 09:12:42 +0200
-Subject: [PATCH 075/204] dv: fix indentation
+Subject: [PATCH 075/278] dv: fix indentation
 
 ---
  libavformat/dv.c |   60 +++++++++++++++++++++++++++---------------------------
diff --git a/debian/patches/post-9beta2/0076-Remove-usage-of-INIT_AVX-in-h264_intrapred_10bit.asm.patch b/debian/patches/post-9beta2/0076-Remove-usage-of-INIT_AVX-in-h264_intrapred_10bit.asm.patch
index 91a9f86..e7a58b2 100644
--- a/debian/patches/post-9beta2/0076-Remove-usage-of-INIT_AVX-in-h264_intrapred_10bit.asm.patch
+++ b/debian/patches/post-9beta2/0076-Remove-usage-of-INIT_AVX-in-h264_intrapred_10bit.asm.patch
@@ -1,7 +1,7 @@
 From c285edd06ea64a24c610c10c06975975cec0d50f Mon Sep 17 00:00:00 2001
 From: "Ronald S. Bultje" <rsbultje at gmail.com>
 Date: Sun, 28 Oct 2012 18:39:22 -0700
-Subject: [PATCH 076/204] Remove usage of INIT_AVX in
+Subject: [PATCH 076/278] Remove usage of INIT_AVX in
  h264_intrapred_10bit.asm.
 
 Replace INIT_AVX by INIT_XMM avx. Port the whole file to use cpuflag
diff --git a/debian/patches/post-9beta2/0077-Remove-INIT_AVX-from-x86inc.asm.patch b/debian/patches/post-9beta2/0077-Remove-INIT_AVX-from-x86inc.asm.patch
index 8bdc33b..f606c29 100644
--- a/debian/patches/post-9beta2/0077-Remove-INIT_AVX-from-x86inc.asm.patch
+++ b/debian/patches/post-9beta2/0077-Remove-INIT_AVX-from-x86inc.asm.patch
@@ -1,7 +1,7 @@
 From 08b028c18dc31b6de741861b9555669dcca4d12a Mon Sep 17 00:00:00 2001
 From: "Ronald S. Bultje" <rsbultje at gmail.com>
 Date: Sun, 28 Oct 2012 18:39:23 -0700
-Subject: [PATCH 077/204] Remove INIT_AVX from x86inc.asm.
+Subject: [PATCH 077/278] Remove INIT_AVX from x86inc.asm.
 
 ---
  libavutil/x86/x86inc.asm |    8 --------
diff --git a/debian/patches/post-9beta2/0078-x86-use-PRED4x4-8x8-8x8L-16x16-macros-to-declare-int.patch b/debian/patches/post-9beta2/0078-x86-use-PRED4x4-8x8-8x8L-16x16-macros-to-declare-int.patch
index 5e072a3..0f00f79 100644
--- a/debian/patches/post-9beta2/0078-x86-use-PRED4x4-8x8-8x8L-16x16-macros-to-declare-int.patch
+++ b/debian/patches/post-9beta2/0078-x86-use-PRED4x4-8x8-8x8L-16x16-macros-to-declare-int.patch
@@ -1,7 +1,7 @@
 From bad8e33dc92aa2abd39410be86159a1d4336ff90 Mon Sep 17 00:00:00 2001
 From: "Ronald S. Bultje" <rsbultje at gmail.com>
 Date: Sun, 28 Oct 2012 20:44:53 -0700
-Subject: [PATCH 078/204] x86: use PRED4x4/8x8/8x8L/16x16 macros to declare
+Subject: [PATCH 078/278] x86: use PRED4x4/8x8/8x8L/16x16 macros to declare
  intrapred prototypes.
 
 ---
diff --git a/debian/patches/post-9beta2/0079-Use-ptrdiff_t-instead-of-int-for-intra-pred-stride-f.patch b/debian/patches/post-9beta2/0079-Use-ptrdiff_t-instead-of-int-for-intra-pred-stride-f.patch
index 1387d54..63c5b91 100644
--- a/debian/patches/post-9beta2/0079-Use-ptrdiff_t-instead-of-int-for-intra-pred-stride-f.patch
+++ b/debian/patches/post-9beta2/0079-Use-ptrdiff_t-instead-of-int-for-intra-pred-stride-f.patch
@@ -1,7 +1,7 @@
 From 95c89da36ebeeb96b7146c0d70f46c582397da7f Mon Sep 17 00:00:00 2001
 From: "Ronald S. Bultje" <rsbultje at gmail.com>
 Date: Sun, 28 Oct 2012 20:44:54 -0700
-Subject: [PATCH 079/204] Use ptrdiff_t instead of int for intra pred "stride"
+Subject: [PATCH 079/278] Use ptrdiff_t instead of int for intra pred "stride"
  function parameter.
 
 This way, SIMD-optimized functions don't have to sign-extend their
diff --git a/debian/patches/post-9beta2/0080-FATE-fix-AD-PCM-test-dependencies-broken-in-e519990.patch b/debian/patches/post-9beta2/0080-FATE-fix-AD-PCM-test-dependencies-broken-in-e519990.patch
index 33e74ff..d547db7 100644
--- a/debian/patches/post-9beta2/0080-FATE-fix-AD-PCM-test-dependencies-broken-in-e519990.patch
+++ b/debian/patches/post-9beta2/0080-FATE-fix-AD-PCM-test-dependencies-broken-in-e519990.patch
@@ -1,7 +1,7 @@
 From 02e636425970fc9b9aebb31dcc7abbd36e54af2a Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Mon, 29 Oct 2012 21:26:46 +0100
-Subject: [PATCH 080/204] FATE: fix (AD)PCM test dependencies broken in
+Subject: [PATCH 080/278] FATE: fix (AD)PCM test dependencies broken in
  e519990
 
 Signed-off-by: Diego Biurrun <diego at biurrun.de>
diff --git a/debian/patches/post-9beta2/0081-configure-rewrite-print_config-function-using-awk.patch b/debian/patches/post-9beta2/0081-configure-rewrite-print_config-function-using-awk.patch
index 000f62b..6c025c7 100644
--- a/debian/patches/post-9beta2/0081-configure-rewrite-print_config-function-using-awk.patch
+++ b/debian/patches/post-9beta2/0081-configure-rewrite-print_config-function-using-awk.patch
@@ -1,7 +1,7 @@
 From f454e879238ce317c6d905d187e7608c461a7087 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans at mansr.com>
 Date: Sat, 27 Oct 2012 16:43:12 +0100
-Subject: [PATCH 081/204] configure: rewrite print_config() function using awk
+Subject: [PATCH 081/278] configure: rewrite print_config() function using awk
 
 This is much faster with slow shells and noticeably faster even
 with bash on a fast Linux system.
diff --git a/debian/patches/post-9beta2/0082-swscale-support-gray-to-9bit-and-10bit-formats.patch b/debian/patches/post-9beta2/0082-swscale-support-gray-to-9bit-and-10bit-formats.patch
index b753e94..8dc8c97 100644
--- a/debian/patches/post-9beta2/0082-swscale-support-gray-to-9bit-and-10bit-formats.patch
+++ b/debian/patches/post-9beta2/0082-swscale-support-gray-to-9bit-and-10bit-formats.patch
@@ -1,7 +1,7 @@
 From 26b5ad2543305f0b148e5b91e9773b6a9a185922 Mon Sep 17 00:00:00 2001
 From: Luca Barbato <lu_zero at gentoo.org>
 Date: Mon, 29 Oct 2012 19:07:01 +0100
-Subject: [PATCH 082/204] swscale: support gray to 9bit and 10bit formats
+Subject: [PATCH 082/278] swscale: support gray to 9bit and 10bit formats
 
 With the input of Kostya and Ronald.
 ---
diff --git a/debian/patches/post-9beta2/0083-pixfmt-support-more-yuva-formats.patch b/debian/patches/post-9beta2/0083-pixfmt-support-more-yuva-formats.patch
index 5895bb2..901cf2e 100644
--- a/debian/patches/post-9beta2/0083-pixfmt-support-more-yuva-formats.patch
+++ b/debian/patches/post-9beta2/0083-pixfmt-support-more-yuva-formats.patch
@@ -1,7 +1,7 @@
 From 7658295ba353b8bedb3af904f46cfb1ba0cea86a Mon Sep 17 00:00:00 2001
 From: Luca Barbato <lu_zero at gentoo.org>
 Date: Sun, 14 Oct 2012 08:06:27 +0200
-Subject: [PATCH 083/204] pixfmt: support more yuva formats
+Subject: [PATCH 083/278] pixfmt: support more yuva formats
 
 Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
 ---
diff --git a/debian/patches/post-9beta2/0084-configure-fix-print_config-with-broke-awks.patch b/debian/patches/post-9beta2/0084-configure-fix-print_config-with-broke-awks.patch
index 5728879..6ec5837 100644
--- a/debian/patches/post-9beta2/0084-configure-fix-print_config-with-broke-awks.patch
+++ b/debian/patches/post-9beta2/0084-configure-fix-print_config-with-broke-awks.patch
@@ -1,7 +1,7 @@
 From d16c4aebba1ba611e10d86aa02be4cdfd3fbc3c5 Mon Sep 17 00:00:00 2001
 From: Mans Rullgard <mans at mansr.com>
 Date: Tue, 30 Oct 2012 11:57:30 +0000
-Subject: [PATCH 084/204] configure: fix print_config() with broke awks
+Subject: [PATCH 084/278] configure: fix print_config() with broke awks
 
 Some awk versions do not treat the result of unary + on a (numeric)
 string as numeric, giving wrong results when used in a boolean context
diff --git a/debian/patches/post-9beta2/0085-cngdec-Update-the-LPC-coefficients-after-averaging-t.patch b/debian/patches/post-9beta2/0085-cngdec-Update-the-LPC-coefficients-after-averaging-t.patch
index f7522d2..1a184d7 100644
--- a/debian/patches/post-9beta2/0085-cngdec-Update-the-LPC-coefficients-after-averaging-t.patch
+++ b/debian/patches/post-9beta2/0085-cngdec-Update-the-LPC-coefficients-after-averaging-t.patch
@@ -1,7 +1,7 @@
 From 9b50d20cd24c0a91bace9d651e2d0fd1e91db3c9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
 Date: Tue, 30 Oct 2012 12:26:39 +0200
-Subject: [PATCH 085/204] cngdec: Update the LPC coefficients after averaging
+Subject: [PATCH 085/278] cngdec: Update the LPC coefficients after averaging
  the reflection coefficients
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
diff --git a/debian/patches/post-9beta2/0086-cngdec-Fix-the-memset-size-to-cover-the-full-array.patch b/debian/patches/post-9beta2/0086-cngdec-Fix-the-memset-size-to-cover-the-full-array.patch
index a073755..981acf5 100644
--- a/debian/patches/post-9beta2/0086-cngdec-Fix-the-memset-size-to-cover-the-full-array.patch
+++ b/debian/patches/post-9beta2/0086-cngdec-Fix-the-memset-size-to-cover-the-full-array.patch
@@ -1,7 +1,7 @@
 From cafefd889b9e9f36814dc4ca13ed169f667b41a4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
 Date: Tue, 30 Oct 2012 12:17:35 +0200
-Subject: [PATCH 086/204] cngdec: Fix the memset size to cover the full array
+Subject: [PATCH 086/278] cngdec: Fix the memset size to cover the full array
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/debian/patches/post-9beta2/0087-cngdec-Make-the-dbov-variable-have-the-right-unit.patch b/debian/patches/post-9beta2/0087-cngdec-Make-the-dbov-variable-have-the-right-unit.patch
index 9f15618..e97b374 100644
--- a/debian/patches/post-9beta2/0087-cngdec-Make-the-dbov-variable-have-the-right-unit.patch
+++ b/debian/patches/post-9beta2/0087-cngdec-Make-the-dbov-variable-have-the-right-unit.patch
@@ -1,7 +1,7 @@
 From 036e6c37d31e471447f71decaea55996bde3d9a2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
 Date: Tue, 30 Oct 2012 11:56:54 +0200
-Subject: [PATCH 087/204] cngdec: Make the dbov variable have the right unit
+Subject: [PATCH 087/278] cngdec: Make the dbov variable have the right unit
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/debian/patches/post-9beta2/0088-cngdec-Allow-flushing-the-decoder.patch b/debian/patches/post-9beta2/0088-cngdec-Allow-flushing-the-decoder.patch
index 43a4eb8..904aaff 100644
--- a/debian/patches/post-9beta2/0088-cngdec-Allow-flushing-the-decoder.patch
+++ b/debian/patches/post-9beta2/0088-cngdec-Allow-flushing-the-decoder.patch
@@ -1,7 +1,7 @@
 From 6b68223d315aa4daf2e9006f6f37418ca5766698 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
 Date: Tue, 30 Oct 2012 12:03:25 +0200
-Subject: [PATCH 088/204] cngdec: Allow flushing the decoder
+Subject: [PATCH 088/278] cngdec: Allow flushing the decoder
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/debian/patches/post-9beta2/0089-cng-Reindent-some-incorrectly-indented-lines.patch b/debian/patches/post-9beta2/0089-cng-Reindent-some-incorrectly-indented-lines.patch
index dd49a8e..676740f 100644
--- a/debian/patches/post-9beta2/0089-cng-Reindent-some-incorrectly-indented-lines.patch
+++ b/debian/patches/post-9beta2/0089-cng-Reindent-some-incorrectly-indented-lines.patch
@@ -1,7 +1,7 @@
 From ab9545a290d1f48eb4c361ecd0b5df0a966a9a79 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
 Date: Tue, 30 Oct 2012 12:09:57 +0200
-Subject: [PATCH 089/204] cng: Reindent some incorrectly indented lines
+Subject: [PATCH 089/278] cng: Reindent some incorrectly indented lines
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/debian/patches/post-9beta2/0090-x86-include-x86inc.asm-in-x86util.asm.patch b/debian/patches/post-9beta2/0090-x86-include-x86inc.asm-in-x86util.asm.patch
index 7aca464..efc27e6 100644
--- a/debian/patches/post-9beta2/0090-x86-include-x86inc.asm-in-x86util.asm.patch
+++ b/debian/patches/post-9beta2/0090-x86-include-x86inc.asm-in-x86util.asm.patch
@@ -1,7 +1,7 @@
 From 6860b4081d046558c44b1b42f22022ea341a2a73 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Sun, 8 Jul 2012 01:20:48 +0200
-Subject: [PATCH 090/204] x86: include x86inc.asm in x86util.asm
+Subject: [PATCH 090/278] x86: include x86inc.asm in x86util.asm
 
 This is necessary to allow refactoring some x86util macros with cpuflags.
 ---
diff --git a/debian/patches/post-9beta2/0091-x86-yasm-Use-complete-source-path-for-macro-helper-i.patch b/debian/patches/post-9beta2/0091-x86-yasm-Use-complete-source-path-for-macro-helper-i.patch
index 746eae0..e8f1d38 100644
--- a/debian/patches/post-9beta2/0091-x86-yasm-Use-complete-source-path-for-macro-helper-i.patch
+++ b/debian/patches/post-9beta2/0091-x86-yasm-Use-complete-source-path-for-macro-helper-i.patch
@@ -1,7 +1,7 @@
 From 04581c8c77ce779e4e70684ac45302972766be0f Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Sun, 15 Jul 2012 11:48:21 +0200
-Subject: [PATCH 091/204] x86: yasm: Use complete source path for macro helper
+Subject: [PATCH 091/278] x86: yasm: Use complete source path for macro helper
  %includes
 
 This is more consistent with the way we handle C #includes and
diff --git a/debian/patches/post-9beta2/0092-x86-mmx2-mmxext-in-comments-and-messages.patch b/debian/patches/post-9beta2/0092-x86-mmx2-mmxext-in-comments-and-messages.patch
index 6cfd154..688e1c1 100644
--- a/debian/patches/post-9beta2/0092-x86-mmx2-mmxext-in-comments-and-messages.patch
+++ b/debian/patches/post-9beta2/0092-x86-mmx2-mmxext-in-comments-and-messages.patch
@@ -1,7 +1,7 @@
 From 652f5185945c8405fc57aed353286858df8d066f Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Sun, 8 Jul 2012 19:16:20 +0200
-Subject: [PATCH 092/204] x86: mmx2 ---> mmxext in comments and messages
+Subject: [PATCH 092/278] x86: mmx2 ---> mmxext in comments and messages
 
 ---
  doc/optimization.txt                  |    2 +-
diff --git a/debian/patches/post-9beta2/0093-x86-mmx2-mmxext-in-variable-names.patch b/debian/patches/post-9beta2/0093-x86-mmx2-mmxext-in-variable-names.patch
index 2923c4d..0424502 100644
--- a/debian/patches/post-9beta2/0093-x86-mmx2-mmxext-in-variable-names.patch
+++ b/debian/patches/post-9beta2/0093-x86-mmx2-mmxext-in-variable-names.patch
@@ -1,7 +1,7 @@
 From a65bdceb060628881578afb29df4eb222421381f Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Sun, 8 Jul 2012 19:55:31 +0200
-Subject: [PATCH 093/204] x86: mmx2 ---> mmxext in variable names
+Subject: [PATCH 093/278] x86: mmx2 ---> mmxext in variable names
 
 ---
  libswscale/swscale_internal.h     |   10 ++---
diff --git a/debian/patches/post-9beta2/0094-x86-MMX2-MMXEXT-in-macro-names.patch b/debian/patches/post-9beta2/0094-x86-MMX2-MMXEXT-in-macro-names.patch
index c727976..c0844d5 100644
--- a/debian/patches/post-9beta2/0094-x86-MMX2-MMXEXT-in-macro-names.patch
+++ b/debian/patches/post-9beta2/0094-x86-MMX2-MMXEXT-in-macro-names.patch
@@ -1,7 +1,7 @@
 From 588fafe7f3bdce1b7265b74320e9bdfad3e25960 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Sun, 8 Jul 2012 19:28:57 +0200
-Subject: [PATCH 094/204] x86: MMX2 ---> MMXEXT in macro names
+Subject: [PATCH 094/278] x86: MMX2 ---> MMXEXT in macro names
 
 ---
  libavcodec/x86/ac3dsp.asm         |    2 +-
diff --git a/debian/patches/post-9beta2/0095-x86-fmtconvert-port-to-cpuflags.patch b/debian/patches/post-9beta2/0095-x86-fmtconvert-port-to-cpuflags.patch
index 3cc04f2..c87ae8d 100644
--- a/debian/patches/post-9beta2/0095-x86-fmtconvert-port-to-cpuflags.patch
+++ b/debian/patches/post-9beta2/0095-x86-fmtconvert-port-to-cpuflags.patch
@@ -1,7 +1,7 @@
 From be923ed659016350592acb9b3346f706f8170ac5 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Sun, 15 Jul 2012 15:42:17 +0200
-Subject: [PATCH 095/204] x86: fmtconvert: port to cpuflags
+Subject: [PATCH 095/278] x86: fmtconvert: port to cpuflags
 
 ---
  libavcodec/x86/fmtconvert.asm |  141 +++++++++++++++++++++--------------------
diff --git a/debian/patches/post-9beta2/0096-x86-fmtconvert-Refactor-cvtps2pi-emulation-through-c.patch b/debian/patches/post-9beta2/0096-x86-fmtconvert-Refactor-cvtps2pi-emulation-through-c.patch
index 0d39f6d..6cc1fb4 100644
--- a/debian/patches/post-9beta2/0096-x86-fmtconvert-Refactor-cvtps2pi-emulation-through-c.patch
+++ b/debian/patches/post-9beta2/0096-x86-fmtconvert-Refactor-cvtps2pi-emulation-through-c.patch
@@ -1,7 +1,7 @@
 From be2c456e962ab0a748164e0e43d0d74cc0d704fa Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Sun, 15 Jul 2012 19:55:21 +0200
-Subject: [PATCH 096/204] x86: fmtconvert: Refactor cvtps2pi emulation through
+Subject: [PATCH 096/278] x86: fmtconvert: Refactor cvtps2pi emulation through
  cpuflags
 
 ---
diff --git a/debian/patches/post-9beta2/0097-x86-Fix-assembly-with-NASM.patch b/debian/patches/post-9beta2/0097-x86-Fix-assembly-with-NASM.patch
index f26433b..796e242 100644
--- a/debian/patches/post-9beta2/0097-x86-Fix-assembly-with-NASM.patch
+++ b/debian/patches/post-9beta2/0097-x86-Fix-assembly-with-NASM.patch
@@ -1,7 +1,7 @@
 From 9c167914a1d88192882fe09dfce430a299580a8a Mon Sep 17 00:00:00 2001
 From: Dave Yeo <dave.r.yeo at gmail.com>
 Date: Tue, 30 Oct 2012 23:48:26 -0700
-Subject: [PATCH 097/204] x86: Fix assembly with NASM
+Subject: [PATCH 097/278] x86: Fix assembly with NASM
 
 Unlike YASM, NASM only looks for include files in the current
 directory, not in the directory that included files reside in.
diff --git a/debian/patches/post-9beta2/0098-aacdec-Drop-some-unused-function-arguments.patch b/debian/patches/post-9beta2/0098-aacdec-Drop-some-unused-function-arguments.patch
index 43de0c1..13c1f9e 100644
--- a/debian/patches/post-9beta2/0098-aacdec-Drop-some-unused-function-arguments.patch
+++ b/debian/patches/post-9beta2/0098-aacdec-Drop-some-unused-function-arguments.patch
@@ -1,7 +1,7 @@
 From 5707af8d0b9c5a7e8a742a11798e406f99d78cea Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Wed, 24 Oct 2012 19:15:54 +0200
-Subject: [PATCH 098/204] aacdec: Drop some unused function arguments
+Subject: [PATCH 098/278] aacdec: Drop some unused function arguments
 
 ---
  libavcodec/aacdec.c |   44 ++++++++++++++++++++------------------------
diff --git a/debian/patches/post-9beta2/0099-swscale-do-not-forget-to-swap-data-in-formats-with-d.patch b/debian/patches/post-9beta2/0099-swscale-do-not-forget-to-swap-data-in-formats-with-d.patch
index 86af041..4287ab1 100644
--- a/debian/patches/post-9beta2/0099-swscale-do-not-forget-to-swap-data-in-formats-with-d.patch
+++ b/debian/patches/post-9beta2/0099-swscale-do-not-forget-to-swap-data-in-formats-with-d.patch
@@ -1,7 +1,7 @@
 From 38fdf7258035eb520ca152e9bea6d95cdfaca424 Mon Sep 17 00:00:00 2001
 From: Kostya Shishkov <kostya.shishkov at gmail.com>
 Date: Wed, 31 Oct 2012 11:26:32 +0100
-Subject: [PATCH 099/204] swscale: do not forget to swap data in formats with
+Subject: [PATCH 099/278] swscale: do not forget to swap data in formats with
  different endianness
 
 Otherwise during scaling it will try to interpret input in the wrong way and
diff --git a/debian/patches/post-9beta2/0100-x86-mmx2-mmxext-in-function-names.patch b/debian/patches/post-9beta2/0100-x86-mmx2-mmxext-in-function-names.patch
index 94aae43..1f8f584 100644
--- a/debian/patches/post-9beta2/0100-x86-mmx2-mmxext-in-function-names.patch
+++ b/debian/patches/post-9beta2/0100-x86-mmx2-mmxext-in-function-names.patch
@@ -1,7 +1,7 @@
 From d8eda3708023db388d80027a79d5df7ee25a5a3f Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Sun, 8 Jul 2012 19:56:10 +0200
-Subject: [PATCH 100/204] x86: mmx2 ---> mmxext in function names
+Subject: [PATCH 100/278] x86: mmx2 ---> mmxext in function names
 
 ---
  libavcodec/dct-test.c           |    4 +-
diff --git a/debian/patches/post-9beta2/0101-x86-h264_chromamc_10bit-drop-pointless-PAVG-define.patch b/debian/patches/post-9beta2/0101-x86-h264_chromamc_10bit-drop-pointless-PAVG-define.patch
index e3cb5e2..eff8bfe 100644
--- a/debian/patches/post-9beta2/0101-x86-h264_chromamc_10bit-drop-pointless-PAVG-define.patch
+++ b/debian/patches/post-9beta2/0101-x86-h264_chromamc_10bit-drop-pointless-PAVG-define.patch
@@ -1,7 +1,7 @@
 From fa8fcab1e0d31074c0644c4ac5194474c6c26415 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Fri, 27 Jul 2012 13:43:33 +0200
-Subject: [PATCH 101/204] x86: h264_chromamc_10bit: drop pointless PAVG
+Subject: [PATCH 101/278] x86: h264_chromamc_10bit: drop pointless PAVG
  %define
 
 It is only used in one place so there is no need for the abstraction.
diff --git a/debian/patches/post-9beta2/0102-x86-Move-optimization-suffix-to-end-of-function-name.patch b/debian/patches/post-9beta2/0102-x86-Move-optimization-suffix-to-end-of-function-name.patch
index eafdbac..d17e18d 100644
--- a/debian/patches/post-9beta2/0102-x86-Move-optimization-suffix-to-end-of-function-name.patch
+++ b/debian/patches/post-9beta2/0102-x86-Move-optimization-suffix-to-end-of-function-name.patch
@@ -1,7 +1,7 @@
 From c37322e68c528717930575ed55fc0e819a8ee215 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Fri, 27 Jul 2012 14:09:52 +0200
-Subject: [PATCH 102/204] x86: Move optimization suffix to end of function
+Subject: [PATCH 102/278] x86: Move optimization suffix to end of function
  names
 
 This simplifies cpuflags porting.
diff --git a/debian/patches/post-9beta2/0103-avconv_opt-cmdutils-Add-missing-function-parameter-D.patch b/debian/patches/post-9beta2/0103-avconv_opt-cmdutils-Add-missing-function-parameter-D.patch
index fe7cc0c..b08ae32 100644
--- a/debian/patches/post-9beta2/0103-avconv_opt-cmdutils-Add-missing-function-parameter-D.patch
+++ b/debian/patches/post-9beta2/0103-avconv_opt-cmdutils-Add-missing-function-parameter-D.patch
@@ -1,7 +1,7 @@
 From 02e4275180866acc0f42281d1c5ef5a46552da84 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Wed, 24 Oct 2012 19:20:13 +0200
-Subject: [PATCH 103/204] avconv_opt, cmdutils: Add missing function parameter
+Subject: [PATCH 103/278] avconv_opt, cmdutils: Add missing function parameter
  Doxygen
 
 ---
diff --git a/debian/patches/post-9beta2/0104-fate-add-ac3-eac3-tests-to-FATE_SAMPLES_AVCONV.patch b/debian/patches/post-9beta2/0104-fate-add-ac3-eac3-tests-to-FATE_SAMPLES_AVCONV.patch
index 04ace58..7e321fa 100644
--- a/debian/patches/post-9beta2/0104-fate-add-ac3-eac3-tests-to-FATE_SAMPLES_AVCONV.patch
+++ b/debian/patches/post-9beta2/0104-fate-add-ac3-eac3-tests-to-FATE_SAMPLES_AVCONV.patch
@@ -1,7 +1,7 @@
 From 6b07830a77729fe25c30026feabd53e8c4c5eb9e Mon Sep 17 00:00:00 2001
 From: Janne Grunau <janne-libav at jannau.net>
 Date: Wed, 31 Oct 2012 19:56:02 +0100
-Subject: [PATCH 104/204] fate: add ac3/eac3 tests to FATE_SAMPLES_AVCONV
+Subject: [PATCH 104/278] fate: add ac3/eac3 tests to FATE_SAMPLES_AVCONV
 
 Fixes typo in 2cbdd7c92958cb8226491d8eb23ed2d57d4b841e.
 ---
diff --git a/debian/patches/post-9beta2/0105-lavc-move-SANE_NB_CHANNELS-to-internal.h-and-use-it-.patch b/debian/patches/post-9beta2/0105-lavc-move-SANE_NB_CHANNELS-to-internal.h-and-use-it-.patch
index a4003ba..fa3e6f6 100644
--- a/debian/patches/post-9beta2/0105-lavc-move-SANE_NB_CHANNELS-to-internal.h-and-use-it-.patch
+++ b/debian/patches/post-9beta2/0105-lavc-move-SANE_NB_CHANNELS-to-internal.h-and-use-it-.patch
@@ -1,7 +1,7 @@
 From bb6941af2afd057c3897afb78d034de2c355b8a0 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Mon, 22 Oct 2012 13:40:10 -0400
-Subject: [PATCH 105/204] lavc: move SANE_NB_CHANNELS to internal.h and use it
+Subject: [PATCH 105/278] lavc: move SANE_NB_CHANNELS to internal.h and use it
  in the PCM decoders
 
 ---
diff --git a/debian/patches/post-9beta2/0106-lavc-check-channel-count-after-decoder-init.patch b/debian/patches/post-9beta2/0106-lavc-check-channel-count-after-decoder-init.patch
index 269f13b..c33e75f 100644
--- a/debian/patches/post-9beta2/0106-lavc-check-channel-count-after-decoder-init.patch
+++ b/debian/patches/post-9beta2/0106-lavc-check-channel-count-after-decoder-init.patch
@@ -1,7 +1,7 @@
 From 0366664ef9af85ee052925f9a1a853d14d2f47a7 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Tue, 23 Oct 2012 00:56:00 -0400
-Subject: [PATCH 106/204] lavc: check channel count after decoder init
+Subject: [PATCH 106/278] lavc: check channel count after decoder init
 
 Ensures the decoder did not set channel count to an insanely high value
 during initialization, which could cause large memory usage when it tries to
diff --git a/debian/patches/post-9beta2/0107-dca_parser-allow-the-parser-to-change-the-sample-rat.patch b/debian/patches/post-9beta2/0107-dca_parser-allow-the-parser-to-change-the-sample-rat.patch
index ba2b180..5158008 100644
--- a/debian/patches/post-9beta2/0107-dca_parser-allow-the-parser-to-change-the-sample-rat.patch
+++ b/debian/patches/post-9beta2/0107-dca_parser-allow-the-parser-to-change-the-sample-rat.patch
@@ -1,7 +1,7 @@
 From a4202003b21ee88c82eec909a0ad086b4c328903 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Sun, 7 Oct 2012 20:52:35 -0400
-Subject: [PATCH 107/204] dca_parser: allow the parser to change the sample
+Subject: [PATCH 107/278] dca_parser: allow the parser to change the sample
  rate
 
 ---
diff --git a/debian/patches/post-9beta2/0108-amrnbdec-set-channels-channel_layout-and-sample_rate.patch b/debian/patches/post-9beta2/0108-amrnbdec-set-channels-channel_layout-and-sample_rate.patch
index c33dcd0..2b14799 100644
--- a/debian/patches/post-9beta2/0108-amrnbdec-set-channels-channel_layout-and-sample_rate.patch
+++ b/debian/patches/post-9beta2/0108-amrnbdec-set-channels-channel_layout-and-sample_rate.patch
@@ -1,7 +1,7 @@
 From b24a4449a5ae84fc73e12c47e35d19c06a8bfdf3 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Sun, 7 Oct 2012 21:17:45 -0400
-Subject: [PATCH 108/204] amrnbdec: set channels, channel_layout, and
+Subject: [PATCH 108/278] amrnbdec: set channels, channel_layout, and
  sample_rate
 
 Only mono 8kHz is supported.
diff --git a/debian/patches/post-9beta2/0109-amrwbdec-set-channels-channel_layout-and-sample_rate.patch b/debian/patches/post-9beta2/0109-amrwbdec-set-channels-channel_layout-and-sample_rate.patch
index 205450d..32982e1 100644
--- a/debian/patches/post-9beta2/0109-amrwbdec-set-channels-channel_layout-and-sample_rate.patch
+++ b/debian/patches/post-9beta2/0109-amrwbdec-set-channels-channel_layout-and-sample_rate.patch
@@ -1,7 +1,7 @@
 From ee0e9678e761e8a41cfffcb163de42967e5a1758 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Sun, 7 Oct 2012 21:19:28 -0400
-Subject: [PATCH 109/204] amrwbdec: set channels, channel_layout, and
+Subject: [PATCH 109/278] amrwbdec: set channels, channel_layout, and
  sample_rate
 
 Only mono 16kHz is supported.
diff --git a/debian/patches/post-9beta2/0110-g722dec-set-channel-layout-at-initialization-instead.patch b/debian/patches/post-9beta2/0110-g722dec-set-channel-layout-at-initialization-instead.patch
index 9417c37..dc78605 100644
--- a/debian/patches/post-9beta2/0110-g722dec-set-channel-layout-at-initialization-instead.patch
+++ b/debian/patches/post-9beta2/0110-g722dec-set-channel-layout-at-initialization-instead.patch
@@ -1,7 +1,7 @@
 From ec2694d25905c217e5815947cda896aa25398388 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Mon, 15 Oct 2012 16:40:44 -0400
-Subject: [PATCH 110/204] g722dec: set channel layout at initialization
+Subject: [PATCH 110/278] g722dec: set channel layout at initialization
  instead of validating it
 
 ---
diff --git a/debian/patches/post-9beta2/0111-dsicinaudio-set-channels-and-channel-layout.patch b/debian/patches/post-9beta2/0111-dsicinaudio-set-channels-and-channel-layout.patch
index 7e4f078..87bb407 100644
--- a/debian/patches/post-9beta2/0111-dsicinaudio-set-channels-and-channel-layout.patch
+++ b/debian/patches/post-9beta2/0111-dsicinaudio-set-channels-and-channel-layout.patch
@@ -1,7 +1,7 @@
 From 4f56f9c48f40db7f84819fc923b79ddaac678ae7 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Wed, 17 Oct 2012 11:29:04 -0400
-Subject: [PATCH 111/204] dsicinaudio: set channels and channel layout
+Subject: [PATCH 111/278] dsicinaudio: set channels and channel layout
 
 ---
  libavcodec/dsicinav.c |   12 +++++-------
diff --git a/debian/patches/post-9beta2/0112-atrac1-do-not-keep-a-copy-of-channel-count-in-the-pr.patch b/debian/patches/post-9beta2/0112-atrac1-do-not-keep-a-copy-of-channel-count-in-the-pr.patch
index 126db74..5634a88 100644
--- a/debian/patches/post-9beta2/0112-atrac1-do-not-keep-a-copy-of-channel-count-in-the-pr.patch
+++ b/debian/patches/post-9beta2/0112-atrac1-do-not-keep-a-copy-of-channel-count-in-the-pr.patch
@@ -1,7 +1,7 @@
 From a38eadf7ed08293667c9f81780f7c081f278f19a Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Wed, 17 Oct 2012 11:45:49 -0400
-Subject: [PATCH 112/204] atrac1: do not keep a copy of channel count in the
+Subject: [PATCH 112/278] atrac1: do not keep a copy of channel count in the
  private context
 
 ---
diff --git a/debian/patches/post-9beta2/0113-bmvaudio-set-channel-layout-at-init-rather-than-vali.patch b/debian/patches/post-9beta2/0113-bmvaudio-set-channel-layout-at-init-rather-than-vali.patch
index a73e03a..35026cb 100644
--- a/debian/patches/post-9beta2/0113-bmvaudio-set-channel-layout-at-init-rather-than-vali.patch
+++ b/debian/patches/post-9beta2/0113-bmvaudio-set-channel-layout-at-init-rather-than-vali.patch
@@ -1,7 +1,7 @@
 From a3145d0335b04d143c26832c91dcc7242c758206 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Sun, 21 Oct 2012 13:48:50 -0400
-Subject: [PATCH 113/204] bmvaudio: set channel layout at init() rather than
+Subject: [PATCH 113/278] bmvaudio: set channel layout at init() rather than
  validating it
 
 ---
diff --git a/debian/patches/post-9beta2/0114-cook-use-AVCodecContext.channels-instead-of-keeping-.patch b/debian/patches/post-9beta2/0114-cook-use-AVCodecContext.channels-instead-of-keeping-.patch
index f074339..d76ef67 100644
--- a/debian/patches/post-9beta2/0114-cook-use-AVCodecContext.channels-instead-of-keeping-.patch
+++ b/debian/patches/post-9beta2/0114-cook-use-AVCodecContext.channels-instead-of-keeping-.patch
@@ -1,7 +1,7 @@
 From 3509eee19c03c23a14c6f226e6cc90072f323025 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Sun, 21 Oct 2012 14:24:04 -0400
-Subject: [PATCH 114/204] cook: use AVCodecContext.channels instead of keeping
+Subject: [PATCH 114/278] cook: use AVCodecContext.channels instead of keeping
  a private copy
 
 ---
diff --git a/debian/patches/post-9beta2/0115-cook-remove-unneeded-COOKContext-variable-bit_rate.patch b/debian/patches/post-9beta2/0115-cook-remove-unneeded-COOKContext-variable-bit_rate.patch
index 0ccfc01..1ff8e38 100644
--- a/debian/patches/post-9beta2/0115-cook-remove-unneeded-COOKContext-variable-bit_rate.patch
+++ b/debian/patches/post-9beta2/0115-cook-remove-unneeded-COOKContext-variable-bit_rate.patch
@@ -1,7 +1,7 @@
 From 8aa5b8c5c825a86449774f6023400b4775c25027 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Sun, 21 Oct 2012 14:25:18 -0400
-Subject: [PATCH 115/204] cook: remove unneeded COOKContext variable, bit_rate
+Subject: [PATCH 115/278] cook: remove unneeded COOKContext variable, bit_rate
 
 ---
  libavcodec/cook.c |    4 +---
diff --git a/debian/patches/post-9beta2/0116-cook-remove-unneeded-COOKContext-variable-sample_rat.patch b/debian/patches/post-9beta2/0116-cook-remove-unneeded-COOKContext-variable-sample_rat.patch
index a416557..3c61ae0 100644
--- a/debian/patches/post-9beta2/0116-cook-remove-unneeded-COOKContext-variable-sample_rat.patch
+++ b/debian/patches/post-9beta2/0116-cook-remove-unneeded-COOKContext-variable-sample_rat.patch
@@ -1,7 +1,7 @@
 From 926e9d28f1a85898545706a26b27c24672c9c716 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Sun, 21 Oct 2012 14:26:29 -0400
-Subject: [PATCH 116/204] cook: remove unneeded COOKContext variable,
+Subject: [PATCH 116/278] cook: remove unneeded COOKContext variable,
  sample_rate
 
 ---
diff --git a/debian/patches/post-9beta2/0117-cook-reverse-a-condition-so-that-the-code-makes-more.patch b/debian/patches/post-9beta2/0117-cook-reverse-a-condition-so-that-the-code-makes-more.patch
index 7174ce8..e480ac7 100644
--- a/debian/patches/post-9beta2/0117-cook-reverse-a-condition-so-that-the-code-makes-more.patch
+++ b/debian/patches/post-9beta2/0117-cook-reverse-a-condition-so-that-the-code-makes-more.patch
@@ -1,7 +1,7 @@
 From d21b2e4726822ec1c604e2b9010a1a2cc0d88aec Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Sun, 21 Oct 2012 14:33:11 -0400
-Subject: [PATCH 117/204] cook: reverse a condition so that the code makes
+Subject: [PATCH 117/278] cook: reverse a condition so that the code makes
  more sense
 
 ---
diff --git a/debian/patches/post-9beta2/0118-cook-use-av_get_channel_layout_nb_channels-instead-o.patch b/debian/patches/post-9beta2/0118-cook-use-av_get_channel_layout_nb_channels-instead-o.patch
index 93e2610..9819eb1 100644
--- a/debian/patches/post-9beta2/0118-cook-use-av_get_channel_layout_nb_channels-instead-o.patch
+++ b/debian/patches/post-9beta2/0118-cook-use-av_get_channel_layout_nb_channels-instead-o.patch
@@ -1,7 +1,7 @@
 From 7efbba2e3665285207bf769b8f0d712cedf1bfd9 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Sun, 21 Oct 2012 14:36:38 -0400
-Subject: [PATCH 118/204] cook: use av_get_channel_layout_nb_channels()
+Subject: [PATCH 118/278] cook: use av_get_channel_layout_nb_channels()
  instead of cook_count_channels()
 
 ---
diff --git a/debian/patches/post-9beta2/0119-cook-move-samples_per_frame-from-COOKSubpacket-to-wh.patch b/debian/patches/post-9beta2/0119-cook-move-samples_per_frame-from-COOKSubpacket-to-wh.patch
index 8aef5e2..5ecc650 100644
--- a/debian/patches/post-9beta2/0119-cook-move-samples_per_frame-from-COOKSubpacket-to-wh.patch
+++ b/debian/patches/post-9beta2/0119-cook-move-samples_per_frame-from-COOKSubpacket-to-wh.patch
@@ -1,7 +1,7 @@
 From 8f173ef019d7e8921ab2cb094718f14e8c016a59 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Sun, 21 Oct 2012 14:43:02 -0400
-Subject: [PATCH 119/204] cook: move samples_per_frame from COOKSubpacket to
+Subject: [PATCH 119/278] cook: move samples_per_frame from COOKSubpacket to
  where it is used
 
 ---
diff --git a/debian/patches/post-9beta2/0120-cook-use-av_dlog-for-debug-logging-instead-of-av_log.patch b/debian/patches/post-9beta2/0120-cook-use-av_dlog-for-debug-logging-instead-of-av_log.patch
index a29c879..1aafdc1 100644
--- a/debian/patches/post-9beta2/0120-cook-use-av_dlog-for-debug-logging-instead-of-av_log.patch
+++ b/debian/patches/post-9beta2/0120-cook-use-av_dlog-for-debug-logging-instead-of-av_log.patch
@@ -1,7 +1,7 @@
 From 93e27f86f161ca5ed811be3570289a4f972862dc Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Sun, 21 Oct 2012 14:47:10 -0400
-Subject: [PATCH 120/204] cook: use av_dlog() for debug logging instead of
+Subject: [PATCH 120/278] cook: use av_dlog() for debug logging instead of
  av_log() with AV_LOG_ERROR
 
 ---
diff --git a/debian/patches/post-9beta2/0121-dcadec-allow-the-decoder-to-change-the-channel-layou.patch b/debian/patches/post-9beta2/0121-dcadec-allow-the-decoder-to-change-the-channel-layou.patch
index 7d3b80b..eee51c8 100644
--- a/debian/patches/post-9beta2/0121-dcadec-allow-the-decoder-to-change-the-channel-layou.patch
+++ b/debian/patches/post-9beta2/0121-dcadec-allow-the-decoder-to-change-the-channel-layou.patch
@@ -1,7 +1,7 @@
 From 8ac0f6767bf63d3e6b308ee6648ff02598b81e03 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Sun, 21 Oct 2012 15:12:36 -0400
-Subject: [PATCH 121/204] dcadec: allow the decoder to change the channel
+Subject: [PATCH 121/278] dcadec: allow the decoder to change the channel
  layout mid-stream
 
 ---
diff --git a/debian/patches/post-9beta2/0122-flacdec-use-av_samples_-functions-for-sample-buffer-.patch b/debian/patches/post-9beta2/0122-flacdec-use-av_samples_-functions-for-sample-buffer-.patch
index 8396349..20891c5 100644
--- a/debian/patches/post-9beta2/0122-flacdec-use-av_samples_-functions-for-sample-buffer-.patch
+++ b/debian/patches/post-9beta2/0122-flacdec-use-av_samples_-functions-for-sample-buffer-.patch
@@ -1,7 +1,7 @@
 From 268f8ba112570956f1d7be8f4f2f0bea86c61461 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Sun, 21 Oct 2012 16:15:34 -0400
-Subject: [PATCH 122/204] flacdec: use av_samples_* functions for sample
+Subject: [PATCH 122/278] flacdec: use av_samples_* functions for sample
  buffer allocation
 
 Also, return an error on allocation failure.
diff --git a/debian/patches/post-9beta2/0123-flacdec-allow-mid-stream-channel-layout-change.patch b/debian/patches/post-9beta2/0123-flacdec-allow-mid-stream-channel-layout-change.patch
index 1bf64bb..3b18b0c 100644
--- a/debian/patches/post-9beta2/0123-flacdec-allow-mid-stream-channel-layout-change.patch
+++ b/debian/patches/post-9beta2/0123-flacdec-allow-mid-stream-channel-layout-change.patch
@@ -1,7 +1,7 @@
 From 90fcac0e95b7d266c148a86506f301a2072d9de3 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Sun, 21 Oct 2012 17:02:28 -0400
-Subject: [PATCH 123/204] flacdec: allow mid-stream channel layout change
+Subject: [PATCH 123/278] flacdec: allow mid-stream channel layout change
 
 Although the libFLAC decoder cannot handle such a change, it is allowed by the
 spec and could potentially occur with live streams.
diff --git a/debian/patches/post-9beta2/0124-flacdec-do-not-warn-on-sample-rate-change.patch b/debian/patches/post-9beta2/0124-flacdec-do-not-warn-on-sample-rate-change.patch
index edf75cd..4fe18c5 100644
--- a/debian/patches/post-9beta2/0124-flacdec-do-not-warn-on-sample-rate-change.patch
+++ b/debian/patches/post-9beta2/0124-flacdec-do-not-warn-on-sample-rate-change.patch
@@ -1,7 +1,7 @@
 From 99d868635725e3b85a5c549e6bb0e97e10cf5248 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Sun, 21 Oct 2012 17:04:58 -0400
-Subject: [PATCH 124/204] flacdec: do not warn on sample rate change
+Subject: [PATCH 124/278] flacdec: do not warn on sample rate change
 
 ---
  libavcodec/flacdec.c |    6 +-----
diff --git a/debian/patches/post-9beta2/0125-g726dec-set-channel-layout-at-initialization-instead.patch b/debian/patches/post-9beta2/0125-g726dec-set-channel-layout-at-initialization-instead.patch
index 4b12e90..71a11ca 100644
--- a/debian/patches/post-9beta2/0125-g726dec-set-channel-layout-at-initialization-instead.patch
+++ b/debian/patches/post-9beta2/0125-g726dec-set-channel-layout-at-initialization-instead.patch
@@ -1,7 +1,7 @@
 From e00eb03cd8bfb6993d33c30ccd560947b5f6bad5 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Mon, 22 Oct 2012 13:26:14 -0400
-Subject: [PATCH 125/204] g726dec: set channel layout at initialization
+Subject: [PATCH 125/278] g726dec: set channel layout at initialization
  instead of validating it
 
 ---
diff --git a/debian/patches/post-9beta2/0126-g726dec-do-not-validate-sample-rate.patch b/debian/patches/post-9beta2/0126-g726dec-do-not-validate-sample-rate.patch
index 7bfb494..a8f924b 100644
--- a/debian/patches/post-9beta2/0126-g726dec-do-not-validate-sample-rate.patch
+++ b/debian/patches/post-9beta2/0126-g726dec-do-not-validate-sample-rate.patch
@@ -1,7 +1,7 @@
 From a346aaf148dc2ce53da30e2f67223834495c0fd6 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Mon, 22 Oct 2012 13:26:46 -0400
-Subject: [PATCH 126/204] g726dec: do not validate sample rate
+Subject: [PATCH 126/278] g726dec: do not validate sample rate
 
 For decoding it does not really matter what the sample rate is.
 ---
diff --git a/debian/patches/post-9beta2/0127-libgsmdec-always-set-channel-layout-and-sample-rate-.patch b/debian/patches/post-9beta2/0127-libgsmdec-always-set-channel-layout-and-sample-rate-.patch
index bfde73d..133fa48 100644
--- a/debian/patches/post-9beta2/0127-libgsmdec-always-set-channel-layout-and-sample-rate-.patch
+++ b/debian/patches/post-9beta2/0127-libgsmdec-always-set-channel-layout-and-sample-rate-.patch
@@ -1,7 +1,7 @@
 From c5b8acad731c06389b98df8248b6a536e1b7e58d Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Mon, 22 Oct 2012 15:43:59 -0400
-Subject: [PATCH 127/204] libgsmdec: always set channel layout and sample rate
+Subject: [PATCH 127/278] libgsmdec: always set channel layout and sample rate
  at initialization
 
 Only mono 8kHz is supported.
diff --git a/debian/patches/post-9beta2/0128-gsmdec-always-set-channel-layout-and-sample-rate-at-.patch b/debian/patches/post-9beta2/0128-gsmdec-always-set-channel-layout-and-sample-rate-at-.patch
index 5338bae..a26f015 100644
--- a/debian/patches/post-9beta2/0128-gsmdec-always-set-channel-layout-and-sample-rate-at-.patch
+++ b/debian/patches/post-9beta2/0128-gsmdec-always-set-channel-layout-and-sample-rate-at-.patch
@@ -1,7 +1,7 @@
 From 32c7769e5c851ff7b47a83113b97a325dde7b442 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Mon, 22 Oct 2012 15:45:38 -0400
-Subject: [PATCH 128/204] gsmdec: always set channel layout and sample rate at
+Subject: [PATCH 128/278] gsmdec: always set channel layout and sample rate at
  initialization
 
 Only mono 8kHz is supported.
diff --git a/debian/patches/post-9beta2/0129-imc-set-channels-to-1-instead-of-validating-it.patch b/debian/patches/post-9beta2/0129-imc-set-channels-to-1-instead-of-validating-it.patch
index 7daca20..0031465 100644
--- a/debian/patches/post-9beta2/0129-imc-set-channels-to-1-instead-of-validating-it.patch
+++ b/debian/patches/post-9beta2/0129-imc-set-channels-to-1-instead-of-validating-it.patch
@@ -1,7 +1,7 @@
 From 1c7a0161538a9e8417086759a5d6d3295337c433 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Mon, 22 Oct 2012 15:54:29 -0400
-Subject: [PATCH 129/204] imc: set channels to 1 instead of validating it
+Subject: [PATCH 129/278] imc: set channels to 1 instead of validating it
 
 ---
  libavcodec/imc.c |    6 ++++--
diff --git a/debian/patches/post-9beta2/0130-dpcm-use-AVCodecContext.channels-instead-of-keeping-.patch b/debian/patches/post-9beta2/0130-dpcm-use-AVCodecContext.channels-instead-of-keeping-.patch
index 01ac09d..9ab8230 100644
--- a/debian/patches/post-9beta2/0130-dpcm-use-AVCodecContext.channels-instead-of-keeping-.patch
+++ b/debian/patches/post-9beta2/0130-dpcm-use-AVCodecContext.channels-instead-of-keeping-.patch
@@ -1,7 +1,7 @@
 From 0fd1ddf15545a7bac1e8d2622d070fdf4bad95d8 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Mon, 22 Oct 2012 16:03:20 -0400
-Subject: [PATCH 130/204] dpcm: use AVCodecContext.channels instead of keeping
+Subject: [PATCH 130/278] dpcm: use AVCodecContext.channels instead of keeping
  a private copy
 
 ---
diff --git a/debian/patches/post-9beta2/0131-libilbc-set-channel-layout.patch b/debian/patches/post-9beta2/0131-libilbc-set-channel-layout.patch
index 103edd7..1d49d86 100644
--- a/debian/patches/post-9beta2/0131-libilbc-set-channel-layout.patch
+++ b/debian/patches/post-9beta2/0131-libilbc-set-channel-layout.patch
@@ -1,7 +1,7 @@
 From 30f8da29bf609d741bbebd33b2a5003c426ab919 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Mon, 22 Oct 2012 17:41:47 -0400
-Subject: [PATCH 131/204] libilbc: set channel layout
+Subject: [PATCH 131/278] libilbc: set channel layout
 
 ---
  libavcodec/libilbc.c |    8 +++++---
diff --git a/debian/patches/post-9beta2/0132-libopencore-amr-set-channel-layout-for-amr-nb-or-if-.patch b/debian/patches/post-9beta2/0132-libopencore-amr-set-channel-layout-for-amr-nb-or-if-.patch
index 73a5016..1b63a2d 100644
--- a/debian/patches/post-9beta2/0132-libopencore-amr-set-channel-layout-for-amr-nb-or-if-.patch
+++ b/debian/patches/post-9beta2/0132-libopencore-amr-set-channel-layout-for-amr-nb-or-if-.patch
@@ -1,7 +1,7 @@
 From d40dab907aad684885988552a84da76488f298c0 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Mon, 22 Oct 2012 17:49:59 -0400
-Subject: [PATCH 132/204] libopencore-amr: set channel layout for amr-nb or if
+Subject: [PATCH 132/278] libopencore-amr: set channel layout for amr-nb or if
  not set by the user
 
 ---
diff --git a/debian/patches/post-9beta2/0133-nellymoserdec-set-channels-to-1.patch b/debian/patches/post-9beta2/0133-nellymoserdec-set-channels-to-1.patch
index 0b8c9cb..1df9964 100644
--- a/debian/patches/post-9beta2/0133-nellymoserdec-set-channels-to-1.patch
+++ b/debian/patches/post-9beta2/0133-nellymoserdec-set-channels-to-1.patch
@@ -1,7 +1,7 @@
 From d26701ce2f3504e2ee341251448db3af6328a69b Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Mon, 22 Oct 2012 17:58:24 -0400
-Subject: [PATCH 133/204] nellymoserdec: set channels to 1
+Subject: [PATCH 133/278] nellymoserdec: set channels to 1
 
 ---
  libavcodec/nellymoserdec.c |    1 +
diff --git a/debian/patches/post-9beta2/0134-qcelpdec-set-channel-layout.patch b/debian/patches/post-9beta2/0134-qcelpdec-set-channel-layout.patch
index 9a00d77..c1e66a8 100644
--- a/debian/patches/post-9beta2/0134-qcelpdec-set-channel-layout.patch
+++ b/debian/patches/post-9beta2/0134-qcelpdec-set-channel-layout.patch
@@ -1,7 +1,7 @@
 From e3d6ab57042ef7b35f24bf154fba39369034a665 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Mon, 22 Oct 2012 18:25:46 -0400
-Subject: [PATCH 134/204] qcelpdec: set channel layout
+Subject: [PATCH 134/278] qcelpdec: set channel layout
 
 ---
  libavcodec/qcelpdec.c |    5 ++++-
diff --git a/debian/patches/post-9beta2/0135-qdm2-make-sure-channels-is-not-0-and-set-channel-lay.patch b/debian/patches/post-9beta2/0135-qdm2-make-sure-channels-is-not-0-and-set-channel-lay.patch
index 2b1d65b..737ecc1 100644
--- a/debian/patches/post-9beta2/0135-qdm2-make-sure-channels-is-not-0-and-set-channel-lay.patch
+++ b/debian/patches/post-9beta2/0135-qdm2-make-sure-channels-is-not-0-and-set-channel-lay.patch
@@ -1,7 +1,7 @@
 From be2ab8b75a634a686a5ced1544c0c9a4ebeab0dc Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Mon, 22 Oct 2012 18:53:19 -0400
-Subject: [PATCH 135/204] qdm2: make sure channels is not <= 0 and set channel
+Subject: [PATCH 135/278] qdm2: make sure channels is not <= 0 and set channel
  layout
 
 ---
diff --git a/debian/patches/post-9beta2/0136-qdm2-remove-unneeded-checks-for-channel-count.patch b/debian/patches/post-9beta2/0136-qdm2-remove-unneeded-checks-for-channel-count.patch
index 820873d..e534470 100644
--- a/debian/patches/post-9beta2/0136-qdm2-remove-unneeded-checks-for-channel-count.patch
+++ b/debian/patches/post-9beta2/0136-qdm2-remove-unneeded-checks-for-channel-count.patch
@@ -1,7 +1,7 @@
 From eb38d8fe926bdce8110fa4be4fddf6598a079a20 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Mon, 22 Oct 2012 18:54:29 -0400
-Subject: [PATCH 136/204] qdm2: remove unneeded checks for channel count
+Subject: [PATCH 136/278] qdm2: remove unneeded checks for channel count
 
 ---
  libavcodec/qdm2.c |    8 --------
diff --git a/debian/patches/post-9beta2/0137-ra144dec-set-channel-layout.patch b/debian/patches/post-9beta2/0137-ra144dec-set-channel-layout.patch
index c867729..ecf7dfa 100644
--- a/debian/patches/post-9beta2/0137-ra144dec-set-channel-layout.patch
+++ b/debian/patches/post-9beta2/0137-ra144dec-set-channel-layout.patch
@@ -1,7 +1,7 @@
 From 6159f6436495ed8859fe9d32c4c2c1a2eb4c1e91 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Mon, 22 Oct 2012 18:57:39 -0400
-Subject: [PATCH 137/204] ra144dec: set channel layout
+Subject: [PATCH 137/278] ra144dec: set channel layout
 
 ---
  libavcodec/ra144dec.c |    5 ++++-
diff --git a/debian/patches/post-9beta2/0138-ra288dec-set-channel-layout.patch b/debian/patches/post-9beta2/0138-ra288dec-set-channel-layout.patch
index 3cccb6f..7231e54 100644
--- a/debian/patches/post-9beta2/0138-ra288dec-set-channel-layout.patch
+++ b/debian/patches/post-9beta2/0138-ra288dec-set-channel-layout.patch
@@ -1,7 +1,7 @@
 From 4e13e50432bd1c1a89f626f8196b55a0302c8f19 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Tue, 23 Oct 2012 00:35:50 -0400
-Subject: [PATCH 138/204] ra288dec: set channel layout
+Subject: [PATCH 138/278] ra288dec: set channel layout
 
 ---
  libavcodec/ra288.c |    7 ++++++-
diff --git a/debian/patches/post-9beta2/0139-shorten-validate-that-the-channel-count-in-the-heade.patch b/debian/patches/post-9beta2/0139-shorten-validate-that-the-channel-count-in-the-heade.patch
index 8bcb58f..62f6c53 100644
--- a/debian/patches/post-9beta2/0139-shorten-validate-that-the-channel-count-in-the-heade.patch
+++ b/debian/patches/post-9beta2/0139-shorten-validate-that-the-channel-count-in-the-heade.patch
@@ -1,7 +1,7 @@
 From 4c53f4aed3edfa58360c7a2a468782eae31d3176 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Tue, 23 Oct 2012 00:40:51 -0400
-Subject: [PATCH 139/204] shorten: validate that the channel count in the
+Subject: [PATCH 139/278] shorten: validate that the channel count in the
  header is not <= 0
 
 ---
diff --git a/debian/patches/post-9beta2/0140-sipr-set-channel-layout.patch b/debian/patches/post-9beta2/0140-sipr-set-channel-layout.patch
index 9db99a2..68a7945 100644
--- a/debian/patches/post-9beta2/0140-sipr-set-channel-layout.patch
+++ b/debian/patches/post-9beta2/0140-sipr-set-channel-layout.patch
@@ -1,7 +1,7 @@
 From 523734eb6a904c43cf73d801f1c885829380f0de Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Tue, 23 Oct 2012 00:51:26 -0400
-Subject: [PATCH 140/204] sipr: set channel layout
+Subject: [PATCH 140/278] sipr: set channel layout
 
 ---
  libavcodec/sipr.c |    5 ++++-
diff --git a/debian/patches/post-9beta2/0141-truespeech-set-channel-layout.patch b/debian/patches/post-9beta2/0141-truespeech-set-channel-layout.patch
index cb39317..6848bb7 100644
--- a/debian/patches/post-9beta2/0141-truespeech-set-channel-layout.patch
+++ b/debian/patches/post-9beta2/0141-truespeech-set-channel-layout.patch
@@ -1,7 +1,7 @@
 From cebea00c8abac0817d3ae8bdd9573a603c655b75 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Tue, 23 Oct 2012 00:53:16 -0400
-Subject: [PATCH 141/204] truespeech: set channel layout
+Subject: [PATCH 141/278] truespeech: set channel layout
 
 ---
  libavcodec/truespeech.c |    4 +++-
diff --git a/debian/patches/post-9beta2/0142-twinvq-validate-that-channels-is-not-0.patch b/debian/patches/post-9beta2/0142-twinvq-validate-that-channels-is-not-0.patch
index f05c74f..e8ac125 100644
--- a/debian/patches/post-9beta2/0142-twinvq-validate-that-channels-is-not-0.patch
+++ b/debian/patches/post-9beta2/0142-twinvq-validate-that-channels-is-not-0.patch
@@ -1,7 +1,7 @@
 From 8cc72ce5a0d8ab6bc88d28cf55cd62674240121d Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Tue, 23 Oct 2012 13:15:24 -0400
-Subject: [PATCH 142/204] twinvq: validate that channels is not <= 0
+Subject: [PATCH 142/278] twinvq: validate that channels is not <= 0
 
 This could occur due to integer overflow when reading the channel count from
 the extradata.
diff --git a/debian/patches/post-9beta2/0143-twinvq-set-channel-layout.patch b/debian/patches/post-9beta2/0143-twinvq-set-channel-layout.patch
index 16770ac..5c5ee5a 100644
--- a/debian/patches/post-9beta2/0143-twinvq-set-channel-layout.patch
+++ b/debian/patches/post-9beta2/0143-twinvq-set-channel-layout.patch
@@ -1,7 +1,7 @@
 From 335826cf5f7169199ed0a8d3a61f697ec0438d30 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Tue, 23 Oct 2012 13:17:17 -0400
-Subject: [PATCH 143/204] twinvq: set channel layout
+Subject: [PATCH 143/278] twinvq: set channel layout
 
 ---
  libavcodec/twinvq.c |    4 ++++
diff --git a/debian/patches/post-9beta2/0144-twinvq-validate-sample-rate-code.patch b/debian/patches/post-9beta2/0144-twinvq-validate-sample-rate-code.patch
index 5333406..78c6aec 100644
--- a/debian/patches/post-9beta2/0144-twinvq-validate-sample-rate-code.patch
+++ b/debian/patches/post-9beta2/0144-twinvq-validate-sample-rate-code.patch
@@ -1,7 +1,7 @@
 From b5f628e227743fc1725a28b5b21f538a40efca82 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Tue, 23 Oct 2012 13:17:50 -0400
-Subject: [PATCH 144/204] twinvq: validate sample rate code
+Subject: [PATCH 144/278] twinvq: validate sample rate code
 
 A large invalid value could cause undefined behavior when left-shifted
 by 8 later in the function.
diff --git a/debian/patches/post-9beta2/0145-vmdaudio-set-channel-layout.patch b/debian/patches/post-9beta2/0145-vmdaudio-set-channel-layout.patch
index 412c16e..e287c85 100644
--- a/debian/patches/post-9beta2/0145-vmdaudio-set-channel-layout.patch
+++ b/debian/patches/post-9beta2/0145-vmdaudio-set-channel-layout.patch
@@ -1,7 +1,7 @@
 From 50a65e7a540ce6747f81d6dbf6a602ad35be77ff Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Tue, 23 Oct 2012 15:27:44 -0400
-Subject: [PATCH 145/204] vmdaudio: set channel layout
+Subject: [PATCH 145/278] vmdaudio: set channel layout
 
 ---
  libavcodec/vmdav.c |    4 ++++
diff --git a/debian/patches/post-9beta2/0146-wma-do-not-keep-private-copies-of-some-AVCodecContex.patch b/debian/patches/post-9beta2/0146-wma-do-not-keep-private-copies-of-some-AVCodecContex.patch
index 9c34e22..aab36e2 100644
--- a/debian/patches/post-9beta2/0146-wma-do-not-keep-private-copies-of-some-AVCodecContex.patch
+++ b/debian/patches/post-9beta2/0146-wma-do-not-keep-private-copies-of-some-AVCodecContex.patch
@@ -1,7 +1,7 @@
 From 2ed40608e9499de7ed6bd4bd61cc50645ec6d8a4 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Tue, 23 Oct 2012 16:30:59 -0400
-Subject: [PATCH 146/204] wma: do not keep private copies of some
+Subject: [PATCH 146/278] wma: do not keep private copies of some
  AVCodecContext fields
 
 channels, sample_rate, bit_rate, and block_align can be used directly from
diff --git a/debian/patches/post-9beta2/0147-wmapro-use-AVCodecContext.channels-instead-of-keepin.patch b/debian/patches/post-9beta2/0147-wmapro-use-AVCodecContext.channels-instead-of-keepin.patch
index 4cb0be7..1f8e305 100644
--- a/debian/patches/post-9beta2/0147-wmapro-use-AVCodecContext.channels-instead-of-keepin.patch
+++ b/debian/patches/post-9beta2/0147-wmapro-use-AVCodecContext.channels-instead-of-keepin.patch
@@ -1,7 +1,7 @@
 From 002097a00bb93718c171c0c0abcc122475dac838 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Tue, 23 Oct 2012 17:10:37 -0400
-Subject: [PATCH 147/204] wmapro: use AVCodecContext.channels instead of
+Subject: [PATCH 147/278] wmapro: use AVCodecContext.channels instead of
  keeping a private copy
 
 ---
diff --git a/debian/patches/post-9beta2/0148-wmavoice-set-channel-layout.patch b/debian/patches/post-9beta2/0148-wmavoice-set-channel-layout.patch
index 0eb56bc..e1dde4a 100644
--- a/debian/patches/post-9beta2/0148-wmavoice-set-channel-layout.patch
+++ b/debian/patches/post-9beta2/0148-wmavoice-set-channel-layout.patch
@@ -1,7 +1,7 @@
 From f7b8506573f28204d39cedc47d03bc5cda3be027 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Tue, 23 Oct 2012 17:19:25 -0400
-Subject: [PATCH 148/204] wmavoice: set channel layout
+Subject: [PATCH 148/278] wmavoice: set channel layout
 
 ---
  libavcodec/wmavoice.c |    3 +++
diff --git a/debian/patches/post-9beta2/0149-ws-snd1-set-channel-layout.patch b/debian/patches/post-9beta2/0149-ws-snd1-set-channel-layout.patch
index c8265d0..3a2a0ef 100644
--- a/debian/patches/post-9beta2/0149-ws-snd1-set-channel-layout.patch
+++ b/debian/patches/post-9beta2/0149-ws-snd1-set-channel-layout.patch
@@ -1,7 +1,7 @@
 From 5459848b146f34defe894129ba1fc0d0572754f5 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Tue, 23 Oct 2012 17:22:53 -0400
-Subject: [PATCH 149/204] ws-snd1: set channel layout
+Subject: [PATCH 149/278] ws-snd1: set channel layout
 
 ---
  libavcodec/ws-snd1.c |   11 +++++------
diff --git a/debian/patches/post-9beta2/0150-decode_audio3-initialize-AVFrame.patch b/debian/patches/post-9beta2/0150-decode_audio3-initialize-AVFrame.patch
index af88a04..9ee5739 100644
--- a/debian/patches/post-9beta2/0150-decode_audio3-initialize-AVFrame.patch
+++ b/debian/patches/post-9beta2/0150-decode_audio3-initialize-AVFrame.patch
@@ -1,7 +1,7 @@
 From 6d1270a0f9ededd37ed14bde52b8ee69b99e8a7f Mon Sep 17 00:00:00 2001
 From: Ilkka Ollakka <ileoo at videolan.org>
 Date: Wed, 31 Oct 2012 11:24:36 +0200
-Subject: [PATCH 150/204] decode_audio3: initialize AVFrame
+Subject: [PATCH 150/278] decode_audio3: initialize AVFrame
 
 Same fix and issue as in a25d912dca9cd553440167e0476c47581359c0fc
 
diff --git a/debian/patches/post-9beta2/0151-doc-Point-to-the-new-location-of-the-c99-to-c89-tool.patch b/debian/patches/post-9beta2/0151-doc-Point-to-the-new-location-of-the-c99-to-c89-tool.patch
index 845a193..4ce529d 100644
--- a/debian/patches/post-9beta2/0151-doc-Point-to-the-new-location-of-the-c99-to-c89-tool.patch
+++ b/debian/patches/post-9beta2/0151-doc-Point-to-the-new-location-of-the-c99-to-c89-tool.patch
@@ -1,7 +1,7 @@
 From c19e9d00a70616b86ae73111a7579a984c5fa585 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
 Date: Thu, 1 Nov 2012 15:27:18 +0200
-Subject: [PATCH 151/204] doc: Point to the new location of the c99-to-c89
+Subject: [PATCH 151/278] doc: Point to the new location of the c99-to-c89
  tool
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
diff --git a/debian/patches/post-9beta2/0152-a64-remove-interleaved-mode.patch b/debian/patches/post-9beta2/0152-a64-remove-interleaved-mode.patch
index 7d148d7..ff7be13 100644
--- a/debian/patches/post-9beta2/0152-a64-remove-interleaved-mode.patch
+++ b/debian/patches/post-9beta2/0152-a64-remove-interleaved-mode.patch
@@ -1,7 +1,7 @@
 From f70381ab9d53132be2d009d6db9649b3cad8288b Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Wed, 31 Oct 2012 22:32:36 +0100
-Subject: [PATCH 152/204] a64: remove interleaved mode.
+Subject: [PATCH 152/278] a64: remove interleaved mode.
 
 It has been disabled since it was added two years ago.
 ---
diff --git a/debian/patches/post-9beta2/0153-rtpdec-factorize-identical-code-used-in-several-hand.patch b/debian/patches/post-9beta2/0153-rtpdec-factorize-identical-code-used-in-several-hand.patch
index 2bd5fb4..f0d98c8 100644
--- a/debian/patches/post-9beta2/0153-rtpdec-factorize-identical-code-used-in-several-hand.patch
+++ b/debian/patches/post-9beta2/0153-rtpdec-factorize-identical-code-used-in-several-hand.patch
@@ -1,7 +1,7 @@
 From 179a5c37e070f619f14289bdc0fa66a08219eed9 Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Thu, 1 Nov 2012 14:03:04 +0100
-Subject: [PATCH 153/204] rtpdec: factorize identical code used in several
+Subject: [PATCH 153/278] rtpdec: factorize identical code used in several
  handlers
 
 ---
diff --git a/debian/patches/post-9beta2/0154-audiointerleave-deobfuscate-a-function-call.patch b/debian/patches/post-9beta2/0154-audiointerleave-deobfuscate-a-function-call.patch
index b560cfa..444506d 100644
--- a/debian/patches/post-9beta2/0154-audiointerleave-deobfuscate-a-function-call.patch
+++ b/debian/patches/post-9beta2/0154-audiointerleave-deobfuscate-a-function-call.patch
@@ -1,7 +1,7 @@
 From fdc867288697d8b052145e80911d2d338d7d02b7 Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Wed, 31 Oct 2012 22:10:41 +0100
-Subject: [PATCH 154/204] audiointerleave: deobfuscate a function call.
+Subject: [PATCH 154/278] audiointerleave: deobfuscate a function call.
 
 right above there is if (pkt) {<do stuff>; pkt = NULL}, so pkt is just a
 fancy name for NULL at this point.
diff --git a/debian/patches/post-9beta2/0155-lavc-add-some-AVPacket-doxy.patch b/debian/patches/post-9beta2/0155-lavc-add-some-AVPacket-doxy.patch
index d8c6945..8176d87 100644
--- a/debian/patches/post-9beta2/0155-lavc-add-some-AVPacket-doxy.patch
+++ b/debian/patches/post-9beta2/0155-lavc-add-some-AVPacket-doxy.patch
@@ -1,7 +1,7 @@
 From 0876c28080750e0978ba77c3f72cdd2b0d069a6f Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Wed, 31 Oct 2012 17:27:24 +0100
-Subject: [PATCH 155/204] lavc: add some AVPacket doxy.
+Subject: [PATCH 155/278] lavc: add some AVPacket doxy.
 
 ---
  libavcodec/avcodec.h |   22 ++++++++++++++++++++++
diff --git a/debian/patches/post-9beta2/0156-rtpdec_vp8-Don-t-parse-fields-that-aren-t-used.patch b/debian/patches/post-9beta2/0156-rtpdec_vp8-Don-t-parse-fields-that-aren-t-used.patch
index c55011b..2623f0f 100644
--- a/debian/patches/post-9beta2/0156-rtpdec_vp8-Don-t-parse-fields-that-aren-t-used.patch
+++ b/debian/patches/post-9beta2/0156-rtpdec_vp8-Don-t-parse-fields-that-aren-t-used.patch
@@ -1,7 +1,7 @@
 From 2b831a59d9ea82ef5d906a58b11c41f51029b16e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
 Date: Tue, 9 Oct 2012 01:17:45 +0300
-Subject: [PATCH 156/204] rtpdec_vp8: Don't parse fields that aren't used
+Subject: [PATCH 156/278] rtpdec_vp8: Don't parse fields that aren't used
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/debian/patches/post-9beta2/0157-dv1394-Swap-the-min-and-max-values-of-the-standard-o.patch b/debian/patches/post-9beta2/0157-dv1394-Swap-the-min-and-max-values-of-the-standard-o.patch
index a84b52e..0a1f925 100644
--- a/debian/patches/post-9beta2/0157-dv1394-Swap-the-min-and-max-values-of-the-standard-o.patch
+++ b/debian/patches/post-9beta2/0157-dv1394-Swap-the-min-and-max-values-of-the-standard-o.patch
@@ -1,7 +1,7 @@
 From e1c804d883f3cca1b492147a2ac5d0aea7460076 Mon Sep 17 00:00:00 2001
 From: Michael Niedermayer <michaelni at gmx.at>
 Date: Fri, 2 Nov 2012 02:07:15 +0100
-Subject: [PATCH 157/204] dv1394: Swap the min and max values of the
+Subject: [PATCH 157/278] dv1394: Swap the min and max values of the
  'standard' option
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
diff --git a/debian/patches/post-9beta2/0158-x86inc-Only-define-program_name-if-the-macro-is-unse.patch b/debian/patches/post-9beta2/0158-x86inc-Only-define-program_name-if-the-macro-is-unse.patch
index a86c081..e636556 100644
--- a/debian/patches/post-9beta2/0158-x86inc-Only-define-program_name-if-the-macro-is-unse.patch
+++ b/debian/patches/post-9beta2/0158-x86inc-Only-define-program_name-if-the-macro-is-unse.patch
@@ -1,7 +1,7 @@
 From 012f73e271638430e035ca68f5803dc2356d6a3e Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Tue, 30 Oct 2012 02:54:25 +0100
-Subject: [PATCH 158/204] x86inc: Only define program_name if the macro is
+Subject: [PATCH 158/278] x86inc: Only define program_name if the macro is
  unset
 
 This allows overriding the value from outside of the file.
diff --git a/debian/patches/post-9beta2/0159-x86util-Add-cpuflags_mmxext-alias-for-cpuflags_mmx2.patch b/debian/patches/post-9beta2/0159-x86util-Add-cpuflags_mmxext-alias-for-cpuflags_mmx2.patch
index 6a8816b..bfaa7ae 100644
--- a/debian/patches/post-9beta2/0159-x86util-Add-cpuflags_mmxext-alias-for-cpuflags_mmx2.patch
+++ b/debian/patches/post-9beta2/0159-x86util-Add-cpuflags_mmxext-alias-for-cpuflags_mmx2.patch
@@ -1,7 +1,7 @@
 From 61bc2bc7d428cafe45f6d9ab40e6c05262d307e9 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Tue, 30 Oct 2012 01:11:14 +0100
-Subject: [PATCH 159/204] x86util: Add cpuflags_mmxext alias for cpuflags_mmx2
+Subject: [PATCH 159/278] x86util: Add cpuflags_mmxext alias for cpuflags_mmx2
 
 "mmxext" is a more sensible name and more common in outside projects.
 ---
diff --git a/debian/patches/post-9beta2/0160-x86-ac3dsp-port-to-cpuflags.patch b/debian/patches/post-9beta2/0160-x86-ac3dsp-port-to-cpuflags.patch
index 5aff748..154351e 100644
--- a/debian/patches/post-9beta2/0160-x86-ac3dsp-port-to-cpuflags.patch
+++ b/debian/patches/post-9beta2/0160-x86-ac3dsp-port-to-cpuflags.patch
@@ -1,7 +1,7 @@
 From 9ce02e14f01de50fcc6f7f459544b140be66d615 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Sun, 15 Jul 2012 15:41:30 +0200
-Subject: [PATCH 160/204] x86: ac3dsp: port to cpuflags
+Subject: [PATCH 160/278] x86: ac3dsp: port to cpuflags
 
 ---
  libavcodec/x86/ac3dsp.asm |   84 ++++++++++++++++++++++-----------------------
diff --git a/debian/patches/post-9beta2/0161-x86-PMINUB-port-to-cpuflags.patch b/debian/patches/post-9beta2/0161-x86-PMINUB-port-to-cpuflags.patch
index 66a4a7b..e497f6b 100644
--- a/debian/patches/post-9beta2/0161-x86-PMINUB-port-to-cpuflags.patch
+++ b/debian/patches/post-9beta2/0161-x86-PMINUB-port-to-cpuflags.patch
@@ -1,7 +1,7 @@
 From 26f01bd106f62ffe501a9baf609c476051d919da Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Sun, 15 Jul 2012 17:43:50 +0200
-Subject: [PATCH 161/204] x86: PMINUB: port to cpuflags
+Subject: [PATCH 161/278] x86: PMINUB: port to cpuflags
 
 ---
  libavcodec/x86/ac3dsp.asm |    3 ---
diff --git a/debian/patches/post-9beta2/0162-PGS-subtitles-Expose-forced-flag.patch b/debian/patches/post-9beta2/0162-PGS-subtitles-Expose-forced-flag.patch
index fbfff0d..9657081 100644
--- a/debian/patches/post-9beta2/0162-PGS-subtitles-Expose-forced-flag.patch
+++ b/debian/patches/post-9beta2/0162-PGS-subtitles-Expose-forced-flag.patch
@@ -1,7 +1,7 @@
 From 85f67c4865d8014ded2aaa64b3cba6e2970342d7 Mon Sep 17 00:00:00 2001
 From: John Stebbins <jstebbins.hb at gmail.com>
 Date: Sat, 20 Oct 2012 09:56:11 -0700
-Subject: [PATCH 162/204] PGS subtitles: Expose forced flag
+Subject: [PATCH 162/278] PGS subtitles: Expose forced flag
 
 Useful for detection of subtitles displayed during foreign language
 scenes.
diff --git a/debian/patches/post-9beta2/0163-parser-Move-Doxygen-documentation-to-the-header-file.patch b/debian/patches/post-9beta2/0163-parser-Move-Doxygen-documentation-to-the-header-file.patch
index 116a6d5..ce2fcf7 100644
--- a/debian/patches/post-9beta2/0163-parser-Move-Doxygen-documentation-to-the-header-file.patch
+++ b/debian/patches/post-9beta2/0163-parser-Move-Doxygen-documentation-to-the-header-file.patch
@@ -1,7 +1,7 @@
 From 9a07c1332cfe092b57b5758f22b686ca58806c60 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Fri, 2 Nov 2012 12:04:16 +0100
-Subject: [PATCH 163/204] parser: Move Doxygen documentation to the header
+Subject: [PATCH 163/278] parser: Move Doxygen documentation to the header
  files
 
 ---
diff --git a/debian/patches/post-9beta2/0164-x86-Refactor-PSWAPD-fallback-implementations-and-por.patch b/debian/patches/post-9beta2/0164-x86-Refactor-PSWAPD-fallback-implementations-and-por.patch
index 0b51b79..416ce91 100644
--- a/debian/patches/post-9beta2/0164-x86-Refactor-PSWAPD-fallback-implementations-and-por.patch
+++ b/debian/patches/post-9beta2/0164-x86-Refactor-PSWAPD-fallback-implementations-and-por.patch
@@ -1,7 +1,7 @@
 From 0a7a94f2e53bcdb8ac5857eb8c67c16f6f1d0f2f Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Thu, 2 Aug 2012 00:55:34 +0200
-Subject: [PATCH 164/204] x86: Refactor PSWAPD fallback implementations and
+Subject: [PATCH 164/278] x86: Refactor PSWAPD fallback implementations and
  port to cpuflags
 
 ---
diff --git a/debian/patches/post-9beta2/0165-vf_drawtext-do-not-use-deprecated-av_tree_node_size.patch b/debian/patches/post-9beta2/0165-vf_drawtext-do-not-use-deprecated-av_tree_node_size.patch
index 845a8c1..1b00770 100644
--- a/debian/patches/post-9beta2/0165-vf_drawtext-do-not-use-deprecated-av_tree_node_size.patch
+++ b/debian/patches/post-9beta2/0165-vf_drawtext-do-not-use-deprecated-av_tree_node_size.patch
@@ -1,7 +1,7 @@
 From b68aac7ea34ec92321508f7365b5f2813766be79 Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Fri, 2 Nov 2012 10:56:30 +0100
-Subject: [PATCH 165/204] vf_drawtext: do not use deprecated av_tree_node_size
+Subject: [PATCH 165/278] vf_drawtext: do not use deprecated av_tree_node_size
 
 ---
  libavfilter/vf_drawtext.c |    2 +-
diff --git a/debian/patches/post-9beta2/0166-crc-move-doxy-to-the-header.patch b/debian/patches/post-9beta2/0166-crc-move-doxy-to-the-header.patch
index 2f9c6e4..f3d613d 100644
--- a/debian/patches/post-9beta2/0166-crc-move-doxy-to-the-header.patch
+++ b/debian/patches/post-9beta2/0166-crc-move-doxy-to-the-header.patch
@@ -1,7 +1,7 @@
 From b4dc6dccbaea08fc0d41e99b020ee1e0e9ff301b Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Fri, 2 Nov 2012 10:58:36 +0100
-Subject: [PATCH 166/204] crc: move doxy to the header
+Subject: [PATCH 166/278] crc: move doxy to the header
 
 ---
  libavutil/crc.c |   28 ----------------------------
diff --git a/debian/patches/post-9beta2/0167-avconv-do-not-free-muxed-packet-on-streamcopy.patch b/debian/patches/post-9beta2/0167-avconv-do-not-free-muxed-packet-on-streamcopy.patch
index ec89750..7ec92f2 100644
--- a/debian/patches/post-9beta2/0167-avconv-do-not-free-muxed-packet-on-streamcopy.patch
+++ b/debian/patches/post-9beta2/0167-avconv-do-not-free-muxed-packet-on-streamcopy.patch
@@ -1,7 +1,7 @@
 From c8977f6d268462e237cee38be6159c7bb701c62e Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Wed, 31 Oct 2012 21:15:41 +0100
-Subject: [PATCH 167/204] avconv: do not free muxed packet on streamcopy.
+Subject: [PATCH 167/278] avconv: do not free muxed packet on streamcopy.
 
 The packet belongs to lavf, the caller must not free it or access it in
 any other way.
diff --git a/debian/patches/post-9beta2/0168-lavf-clarify-the-lifetime-of-demuxed-packets.patch b/debian/patches/post-9beta2/0168-lavf-clarify-the-lifetime-of-demuxed-packets.patch
index 48aaf84..8834b18 100644
--- a/debian/patches/post-9beta2/0168-lavf-clarify-the-lifetime-of-demuxed-packets.patch
+++ b/debian/patches/post-9beta2/0168-lavf-clarify-the-lifetime-of-demuxed-packets.patch
@@ -1,7 +1,7 @@
 From 717a4509930854081deea54a3bfcdb547161fecf Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Wed, 31 Oct 2012 19:59:53 +0100
-Subject: [PATCH 168/204] lavf: clarify the lifetime of demuxed packets.
+Subject: [PATCH 168/278] lavf: clarify the lifetime of demuxed packets.
 
 ---
  libavformat/avformat.h |   26 ++++++++++++++++----------
diff --git a/debian/patches/post-9beta2/0169-lavf-fix-av_interleaved_write_frame-doxy.patch b/debian/patches/post-9beta2/0169-lavf-fix-av_interleaved_write_frame-doxy.patch
index cdb2c83..48271d6 100644
--- a/debian/patches/post-9beta2/0169-lavf-fix-av_interleaved_write_frame-doxy.patch
+++ b/debian/patches/post-9beta2/0169-lavf-fix-av_interleaved_write_frame-doxy.patch
@@ -1,7 +1,7 @@
 From 9221efef7968463f3e3d9ce79ea72eaca082e73f Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Wed, 31 Oct 2012 16:54:16 +0100
-Subject: [PATCH 169/204] lavf: fix av_interleaved_write_frame() doxy.
+Subject: [PATCH 169/278] lavf: fix av_interleaved_write_frame() doxy.
 
 A sentence was mistakenly inserted in the middle of another sentence.
 ---
diff --git a/debian/patches/post-9beta2/0170-matroskadec-do-not-use-avpacket-internals.patch b/debian/patches/post-9beta2/0170-matroskadec-do-not-use-avpacket-internals.patch
index 948ec2e..206118d 100644
--- a/debian/patches/post-9beta2/0170-matroskadec-do-not-use-avpacket-internals.patch
+++ b/debian/patches/post-9beta2/0170-matroskadec-do-not-use-avpacket-internals.patch
@@ -1,7 +1,7 @@
 From 34871beb5eb6bc59f5e58326a214efd88a4c2ccd Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Thu, 1 Nov 2012 06:34:41 +0100
-Subject: [PATCH 170/204] matroskadec: do not use avpacket internals
+Subject: [PATCH 170/278] matroskadec: do not use avpacket internals
 
 ---
  libavformat/matroskadec.c |   15 ++++++++-------
diff --git a/debian/patches/post-9beta2/0171-doc-add-apidoc-target-for-doxygen-API-documentation.patch b/debian/patches/post-9beta2/0171-doc-add-apidoc-target-for-doxygen-API-documentation.patch
index 5aa5425..60034ea 100644
--- a/debian/patches/post-9beta2/0171-doc-add-apidoc-target-for-doxygen-API-documentation.patch
+++ b/debian/patches/post-9beta2/0171-doc-add-apidoc-target-for-doxygen-API-documentation.patch
@@ -1,7 +1,7 @@
 From b3fab1f2cd22bfaee95831af57a65f803f03083c Mon Sep 17 00:00:00 2001
 From: Janne Grunau <janne-libav at jannau.net>
 Date: Mon, 29 Oct 2012 16:26:59 +0100
-Subject: [PATCH 171/204] doc: add apidoc target for doxygen API documentation
+Subject: [PATCH 171/278] doc: add apidoc target for doxygen API documentation
 
 Documentation includes only the externally visible API of the installed
 headers.
diff --git a/debian/patches/post-9beta2/0172-rtmp-Use-av_strlcat-instead-of-strncat.patch b/debian/patches/post-9beta2/0172-rtmp-Use-av_strlcat-instead-of-strncat.patch
index cad3451..5918140 100644
--- a/debian/patches/post-9beta2/0172-rtmp-Use-av_strlcat-instead-of-strncat.patch
+++ b/debian/patches/post-9beta2/0172-rtmp-Use-av_strlcat-instead-of-strncat.patch
@@ -1,7 +1,7 @@
 From d578f94746dd85dd066abb8bc6bd3c5825a4f759 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
 Date: Mon, 5 Nov 2012 11:01:24 +0200
-Subject: [PATCH 172/204] rtmp: Use av_strlcat instead of strncat
+Subject: [PATCH 172/278] rtmp: Use av_strlcat instead of strncat
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/debian/patches/post-9beta2/0173-x86-vc1dsp-port-to-cpuflags.patch b/debian/patches/post-9beta2/0173-x86-vc1dsp-port-to-cpuflags.patch
index cf94f33..3017f3e 100644
--- a/debian/patches/post-9beta2/0173-x86-vc1dsp-port-to-cpuflags.patch
+++ b/debian/patches/post-9beta2/0173-x86-vc1dsp-port-to-cpuflags.patch
@@ -1,7 +1,7 @@
 From 6c104826bd6e46ff5a02a3f1dcbd6e0b6bf8743a Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Sun, 15 Jul 2012 18:49:44 +0200
-Subject: [PATCH 173/204] x86: vc1dsp: port to cpuflags
+Subject: [PATCH 173/278] x86: vc1dsp: port to cpuflags
 
 ---
  libavcodec/x86/vc1dsp.asm    |   83 +++++++++++++++++++++---------------------
diff --git a/debian/patches/post-9beta2/0174-x86-PABSW-port-to-cpuflags.patch b/debian/patches/post-9beta2/0174-x86-PABSW-port-to-cpuflags.patch
index 4b0f5e3..8d30a6e 100644
--- a/debian/patches/post-9beta2/0174-x86-PABSW-port-to-cpuflags.patch
+++ b/debian/patches/post-9beta2/0174-x86-PABSW-port-to-cpuflags.patch
@@ -1,7 +1,7 @@
 From dbb37e77117466edfc146f9f0df4c70bef6239d6 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Sun, 15 Jul 2012 17:59:26 +0200
-Subject: [PATCH 174/204] x86: PABSW: port to cpuflags
+Subject: [PATCH 174/278] x86: PABSW: port to cpuflags
 
 ---
  libavcodec/x86/vc1dsp.asm |    3 ---
diff --git a/debian/patches/post-9beta2/0175-x86-h264qpel-Only-define-mmxext-QPEL-functions-if-H2.patch b/debian/patches/post-9beta2/0175-x86-h264qpel-Only-define-mmxext-QPEL-functions-if-H2.patch
index f651467..99eb68e 100644
--- a/debian/patches/post-9beta2/0175-x86-h264qpel-Only-define-mmxext-QPEL-functions-if-H2.patch
+++ b/debian/patches/post-9beta2/0175-x86-h264qpel-Only-define-mmxext-QPEL-functions-if-H2.patch
@@ -1,7 +1,7 @@
 From 930e26a3ea9d223e04bac4cdde13697cec770031 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Fri, 2 Nov 2012 18:25:08 +0100
-Subject: [PATCH 175/204] x86: h264qpel: Only define mmxext QPEL functions if
+Subject: [PATCH 175/278] x86: h264qpel: Only define mmxext QPEL functions if
  H264QPEL is enabled
 
 This fixes compilation with --disable-everything and components enabled.
diff --git a/debian/patches/post-9beta2/0176-build-The-A64-muxer-depends-on-rawenc.o-for-ff_raw_w.patch b/debian/patches/post-9beta2/0176-build-The-A64-muxer-depends-on-rawenc.o-for-ff_raw_w.patch
index c7c94a3..719359a 100644
--- a/debian/patches/post-9beta2/0176-build-The-A64-muxer-depends-on-rawenc.o-for-ff_raw_w.patch
+++ b/debian/patches/post-9beta2/0176-build-The-A64-muxer-depends-on-rawenc.o-for-ff_raw_w.patch
@@ -1,7 +1,7 @@
 From 92fec47d69d2c3187bea2f246984e03ec6ca3c3c Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Fri, 2 Nov 2012 22:49:04 +0100
-Subject: [PATCH 176/204] build: The A64 muxer depends on rawenc.o for
+Subject: [PATCH 176/278] build: The A64 muxer depends on rawenc.o for
  ff_raw_write_packet()
 
 ---
diff --git a/debian/patches/post-9beta2/0177-fate-aac-Place-LATM-tests-and-general-AAC-tests-in-d.patch b/debian/patches/post-9beta2/0177-fate-aac-Place-LATM-tests-and-general-AAC-tests-in-d.patch
index a9d981f..c56901f 100644
--- a/debian/patches/post-9beta2/0177-fate-aac-Place-LATM-tests-and-general-AAC-tests-in-d.patch
+++ b/debian/patches/post-9beta2/0177-fate-aac-Place-LATM-tests-and-general-AAC-tests-in-d.patch
@@ -1,7 +1,7 @@
 From 2253df76c1913b5fcc71a9f4f254c78acd9be669 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Sat, 20 Oct 2012 12:21:41 +0200
-Subject: [PATCH 177/204] fate: aac: Place LATM tests and general AAC tests in
+Subject: [PATCH 177/278] fate: aac: Place LATM tests and general AAC tests in
  different groups
 
 ---
diff --git a/debian/patches/post-9beta2/0178-flacenc-use-a-separate-buffer-for-byte-swapping-for-.patch b/debian/patches/post-9beta2/0178-flacenc-use-a-separate-buffer-for-byte-swapping-for-.patch
index 4481717..6d68716 100644
--- a/debian/patches/post-9beta2/0178-flacenc-use-a-separate-buffer-for-byte-swapping-for-.patch
+++ b/debian/patches/post-9beta2/0178-flacenc-use-a-separate-buffer-for-byte-swapping-for-.patch
@@ -1,7 +1,7 @@
 From 6a744d261930f8101132bc6d207b6eac41d9cf18 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Thu, 25 Oct 2012 15:00:10 -0400
-Subject: [PATCH 178/204] flacenc: use a separate buffer for byte-swapping for
+Subject: [PATCH 178/278] flacenc: use a separate buffer for byte-swapping for
  MD5 checksum on big-endian
 
 This is much faster than calculating the MD5 one sample at a time.
diff --git a/debian/patches/post-9beta2/0179-lavu-add-av_ctz-for-trailing-zero-bit-count.patch b/debian/patches/post-9beta2/0179-lavu-add-av_ctz-for-trailing-zero-bit-count.patch
index e95f92b..3a173f3 100644
--- a/debian/patches/post-9beta2/0179-lavu-add-av_ctz-for-trailing-zero-bit-count.patch
+++ b/debian/patches/post-9beta2/0179-lavu-add-av_ctz-for-trailing-zero-bit-count.patch
@@ -1,7 +1,7 @@
 From dfde8a34e5419ac99265e3ecc2e82f378674128a Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Fri, 26 Oct 2012 14:48:40 -0400
-Subject: [PATCH 179/204] lavu: add av_ctz() for trailing zero bit count
+Subject: [PATCH 179/278] lavu: add av_ctz() for trailing zero bit count
 
 ---
  doc/APIchanges      |    3 +++
diff --git a/debian/patches/post-9beta2/0180-flacenc-remove-wasted-trailing-0-bits.patch b/debian/patches/post-9beta2/0180-flacenc-remove-wasted-trailing-0-bits.patch
index e6f3a37..8060d4b 100644
--- a/debian/patches/post-9beta2/0180-flacenc-remove-wasted-trailing-0-bits.patch
+++ b/debian/patches/post-9beta2/0180-flacenc-remove-wasted-trailing-0-bits.patch
@@ -1,7 +1,7 @@
 From e78331632208a23b285a70b3cdd487dd54617c46 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Thu, 25 Oct 2012 15:07:59 -0400
-Subject: [PATCH 180/204] flacenc: remove wasted trailing 0 bits
+Subject: [PATCH 180/278] flacenc: remove wasted trailing 0 bits
 
 ---
  libavcodec/flacenc.c |   39 +++++++++++++++++++++++++++++++++++++--
diff --git a/debian/patches/post-9beta2/0181-flacenc-use-uint64_t-for-bit-counts.patch b/debian/patches/post-9beta2/0181-flacenc-use-uint64_t-for-bit-counts.patch
index b3fa768..a977004 100644
--- a/debian/patches/post-9beta2/0181-flacenc-use-uint64_t-for-bit-counts.patch
+++ b/debian/patches/post-9beta2/0181-flacenc-use-uint64_t-for-bit-counts.patch
@@ -1,7 +1,7 @@
 From 5ff998a233d759d0de83ea6f95c383d03d25d88e Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Fri, 26 Oct 2012 23:22:38 -0400
-Subject: [PATCH 181/204] flacenc: use uint64_t for bit counts
+Subject: [PATCH 181/278] flacenc: use uint64_t for bit counts
 
 Needed to avoid integer overflows for 24-bit encoding.
 ---
diff --git a/debian/patches/post-9beta2/0182-flacdsp-move-lpc-encoding-from-FLAC-encoder-to-FLACD.patch b/debian/patches/post-9beta2/0182-flacdsp-move-lpc-encoding-from-FLAC-encoder-to-FLACD.patch
index c0cba57..dc7102e 100644
--- a/debian/patches/post-9beta2/0182-flacdsp-move-lpc-encoding-from-FLAC-encoder-to-FLACD.patch
+++ b/debian/patches/post-9beta2/0182-flacdsp-move-lpc-encoding-from-FLAC-encoder-to-FLACD.patch
@@ -1,7 +1,7 @@
 From 799e2324901c2a06e9a60ee281cd283475f1c4fa Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Sat, 27 Oct 2012 00:25:04 -0400
-Subject: [PATCH 182/204] flacdsp: move lpc encoding from FLAC encoder to
+Subject: [PATCH 182/278] flacdsp: move lpc encoding from FLAC encoder to
  FLACDSPContext
 
 Also, templatize the functions for 16-bit and 32-bit sample range. This will
diff --git a/debian/patches/post-9beta2/0183-flacenc-add-24-bit-encoding.patch b/debian/patches/post-9beta2/0183-flacenc-add-24-bit-encoding.patch
index 94e8799..a61db9d 100644
--- a/debian/patches/post-9beta2/0183-flacenc-add-24-bit-encoding.patch
+++ b/debian/patches/post-9beta2/0183-flacenc-add-24-bit-encoding.patch
@@ -1,7 +1,7 @@
 From 13e1ee6c84f095b052026b18611ce68c76666474 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Sat, 27 Oct 2012 00:26:02 -0400
-Subject: [PATCH 183/204] flacenc: add 24-bit encoding
+Subject: [PATCH 183/278] flacenc: add 24-bit encoding
 
 ---
  libavcodec/flacenc.c |   88 ++++++++++++++++++++++++++++++++++++--------------
diff --git a/debian/patches/post-9beta2/0184-flacenc-use-RICE2-entropy-coding-mode-for-24-bit.patch b/debian/patches/post-9beta2/0184-flacenc-use-RICE2-entropy-coding-mode-for-24-bit.patch
index 064e48d..ff8a9a8 100644
--- a/debian/patches/post-9beta2/0184-flacenc-use-RICE2-entropy-coding-mode-for-24-bit.patch
+++ b/debian/patches/post-9beta2/0184-flacenc-use-RICE2-entropy-coding-mode-for-24-bit.patch
@@ -1,7 +1,7 @@
 From 2e76f34387762405b79d2f7f26659826089c7275 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Sat, 27 Oct 2012 00:46:43 -0400
-Subject: [PATCH 184/204] flacenc: use RICE2 entropy coding mode for 24-bit
+Subject: [PATCH 184/278] flacenc: use RICE2 entropy coding mode for 24-bit
 
 ---
  libavcodec/flacenc.c |   55 +++++++++++++++++++++++++++++++++++---------------
diff --git a/debian/patches/post-9beta2/0185-FATE-rename-FLAC-tests-from-flac-to-flac-16.patch b/debian/patches/post-9beta2/0185-FATE-rename-FLAC-tests-from-flac-to-flac-16.patch
index d3b3dea..a3e0ef7 100644
--- a/debian/patches/post-9beta2/0185-FATE-rename-FLAC-tests-from-flac-to-flac-16.patch
+++ b/debian/patches/post-9beta2/0185-FATE-rename-FLAC-tests-from-flac-to-flac-16.patch
@@ -1,7 +1,7 @@
 From 31c3b9c95e2b14189f2bc9f2bd886834114da81d Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Sat, 27 Oct 2012 01:22:07 -0400
-Subject: [PATCH 185/204] FATE: rename FLAC tests from flac-* to flac-16-*
+Subject: [PATCH 185/278] FATE: rename FLAC tests from flac-* to flac-16-*
 
 This will distinguish FLAC 16-bit tests from FLAC tests with other bit
 depths.
diff --git a/debian/patches/post-9beta2/0186-FATE-add-a-24-bit-FLAC-encoding-test.patch b/debian/patches/post-9beta2/0186-FATE-add-a-24-bit-FLAC-encoding-test.patch
index 4e5e68f..7c42ccc 100644
--- a/debian/patches/post-9beta2/0186-FATE-add-a-24-bit-FLAC-encoding-test.patch
+++ b/debian/patches/post-9beta2/0186-FATE-add-a-24-bit-FLAC-encoding-test.patch
@@ -1,7 +1,7 @@
 From 8a58894fc63c9d367c4cd6a17e277d1a8608c2c0 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Mon, 5 Nov 2012 12:49:36 -0500
-Subject: [PATCH 186/204] FATE: add a 24-bit FLAC encoding test
+Subject: [PATCH 186/278] FATE: add a 24-bit FLAC encoding test
 
 ---
  tests/fate/flac.mak |    6 ++++++
diff --git a/debian/patches/post-9beta2/0187-x86-avresample-Add-missing-colons-to-assembly-labels.patch b/debian/patches/post-9beta2/0187-x86-avresample-Add-missing-colons-to-assembly-labels.patch
index 73ce61d..5bc676a 100644
--- a/debian/patches/post-9beta2/0187-x86-avresample-Add-missing-colons-to-assembly-labels.patch
+++ b/debian/patches/post-9beta2/0187-x86-avresample-Add-missing-colons-to-assembly-labels.patch
@@ -1,7 +1,7 @@
 From 352e18b766650d298a3ba54f757259220746b03b Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Tue, 6 Nov 2012 12:07:35 +0100
-Subject: [PATCH 187/204] x86: avresample: Add missing colons to assembly
+Subject: [PATCH 187/278] x86: avresample: Add missing colons to assembly
  labels
 
 YASM accepts labels without colons, but NASM issues warnings.
diff --git a/debian/patches/post-9beta2/0188-fate-aac-cosmetics-Group-AAC-LATM-tests-together.patch b/debian/patches/post-9beta2/0188-fate-aac-cosmetics-Group-AAC-LATM-tests-together.patch
index 9ccddd7..0555c84 100644
--- a/debian/patches/post-9beta2/0188-fate-aac-cosmetics-Group-AAC-LATM-tests-together.patch
+++ b/debian/patches/post-9beta2/0188-fate-aac-cosmetics-Group-AAC-LATM-tests-together.patch
@@ -1,7 +1,7 @@
 From 06c7b33831451761c6f8c2e3ca8f2d7340d603a0 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Sat, 20 Oct 2012 12:19:54 +0200
-Subject: [PATCH 188/204] fate: aac: cosmetics: Group AAC LATM tests together
+Subject: [PATCH 188/278] fate: aac: cosmetics: Group AAC LATM tests together
 
 ---
  tests/fate/aac.mak |   16 ++++++++--------
diff --git a/debian/patches/post-9beta2/0189-fate-atrac-Place-atrac1-and-atrac3-tests-in-differen.patch b/debian/patches/post-9beta2/0189-fate-atrac-Place-atrac1-and-atrac3-tests-in-differen.patch
index 6bc0f1c..d41ce72 100644
--- a/debian/patches/post-9beta2/0189-fate-atrac-Place-atrac1-and-atrac3-tests-in-differen.patch
+++ b/debian/patches/post-9beta2/0189-fate-atrac-Place-atrac1-and-atrac3-tests-in-differen.patch
@@ -1,7 +1,7 @@
 From e6c4c0f7cfaf0378a70f6f7f0611d4c21433067a Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Sat, 20 Oct 2012 01:09:33 +0200
-Subject: [PATCH 189/204] fate: atrac: Place atrac1 and atrac3 tests in
+Subject: [PATCH 189/278] fate: atrac: Place atrac1 and atrac3 tests in
  different groups
 
 ---
diff --git a/debian/patches/post-9beta2/0190-libopencore-amr-Check-the-return-value-of-amr_decode.patch b/debian/patches/post-9beta2/0190-libopencore-amr-Check-the-return-value-of-amr_decode.patch
index c12b909..bb6eb82 100644
--- a/debian/patches/post-9beta2/0190-libopencore-amr-Check-the-return-value-of-amr_decode.patch
+++ b/debian/patches/post-9beta2/0190-libopencore-amr-Check-the-return-value-of-amr_decode.patch
@@ -1,7 +1,7 @@
 From ad961726dc0bec7435aae7fbab10471b9063018b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
 Date: Tue, 6 Nov 2012 12:18:57 +0200
-Subject: [PATCH 190/204] libopencore-amr: Check the return value of
+Subject: [PATCH 190/278] libopencore-amr: Check the return value of
  amr_decode_fix_avctx
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
diff --git a/debian/patches/post-9beta2/0191-libvpxenc-Allow-enabling-constrained-quality-CQ-mode.patch b/debian/patches/post-9beta2/0191-libvpxenc-Allow-enabling-constrained-quality-CQ-mode.patch
index 002ff90..f6b5884 100644
--- a/debian/patches/post-9beta2/0191-libvpxenc-Allow-enabling-constrained-quality-CQ-mode.patch
+++ b/debian/patches/post-9beta2/0191-libvpxenc-Allow-enabling-constrained-quality-CQ-mode.patch
@@ -1,7 +1,7 @@
 From 12776d5d2a46363c52603ae2be888a3094fce1c6 Mon Sep 17 00:00:00 2001
 From: James Zern <jzern at google.com>
 Date: Mon, 11 Apr 2011 17:00:35 -0700
-Subject: [PATCH 191/204] libvpxenc: Allow enabling constrained quality (CQ)
+Subject: [PATCH 191/278] libvpxenc: Allow enabling constrained quality (CQ)
  mode
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
diff --git a/debian/patches/post-9beta2/0192-x86-h264_intrapred-port-to-cpuflags.patch b/debian/patches/post-9beta2/0192-x86-h264_intrapred-port-to-cpuflags.patch
index 0c1f404..55d75e6 100644
--- a/debian/patches/post-9beta2/0192-x86-h264_intrapred-port-to-cpuflags.patch
+++ b/debian/patches/post-9beta2/0192-x86-h264_intrapred-port-to-cpuflags.patch
@@ -1,7 +1,7 @@
 From 6ca60d4ddd9b34b98b8570d440d79736d060f02a Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Tue, 10 Jul 2012 00:04:18 +0200
-Subject: [PATCH 192/204] x86: h264_intrapred: port to cpuflags
+Subject: [PATCH 192/278] x86: h264_intrapred: port to cpuflags
 
 ---
  libavcodec/x86/h264_intrapred.asm |  230 +++++++++++++++++++------------------
diff --git a/debian/patches/post-9beta2/0193-rtpenc_aac-Fix-calculation-of-the-header-size.patch b/debian/patches/post-9beta2/0193-rtpenc_aac-Fix-calculation-of-the-header-size.patch
index 419bc0d..ddbb0e6 100644
--- a/debian/patches/post-9beta2/0193-rtpenc_aac-Fix-calculation-of-the-header-size.patch
+++ b/debian/patches/post-9beta2/0193-rtpenc_aac-Fix-calculation-of-the-header-size.patch
@@ -1,7 +1,7 @@
 From e004d175fe2463af8242e390b15350f4745be7b4 Mon Sep 17 00:00:00 2001
 From: Luca Abeni <lucabe72 at email.it>
 Date: Thu, 8 Nov 2012 01:38:50 +0100
-Subject: [PATCH 193/204] rtpenc_aac: Fix calculation of the header size
+Subject: [PATCH 193/278] rtpenc_aac: Fix calculation of the header size
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/debian/patches/post-9beta2/0194-add-24-bit-FLAC-encoding-to-Changelog.patch b/debian/patches/post-9beta2/0194-add-24-bit-FLAC-encoding-to-Changelog.patch
index 5244514..81d66f6 100644
--- a/debian/patches/post-9beta2/0194-add-24-bit-FLAC-encoding-to-Changelog.patch
+++ b/debian/patches/post-9beta2/0194-add-24-bit-FLAC-encoding-to-Changelog.patch
@@ -1,7 +1,7 @@
 From 00f8ad41c78df71c464e98d2c1171a40f205db78 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Mon, 5 Nov 2012 15:36:19 -0500
-Subject: [PATCH 194/204] add 24-bit FLAC encoding to Changelog
+Subject: [PATCH 194/278] add 24-bit FLAC encoding to Changelog
 
 Also move a misplaced line from the 9_beta2 section to <next>
 ---
diff --git a/debian/patches/post-9beta2/0195-avconv-rescale-packet-duration-to-muxer-time-base-wh.patch b/debian/patches/post-9beta2/0195-avconv-rescale-packet-duration-to-muxer-time-base-wh.patch
index e826ec1..90147b3 100644
--- a/debian/patches/post-9beta2/0195-avconv-rescale-packet-duration-to-muxer-time-base-wh.patch
+++ b/debian/patches/post-9beta2/0195-avconv-rescale-packet-duration-to-muxer-time-base-wh.patch
@@ -1,7 +1,7 @@
 From 3ba416408aef99b4d7d92719c0a03dc2c9647025 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Tue, 6 Nov 2012 14:24:31 -0500
-Subject: [PATCH 195/204] avconv: rescale packet duration to muxer time base
+Subject: [PATCH 195/278] avconv: rescale packet duration to muxer time base
  when flushing encoders
 
 Fixes Bug 385
diff --git a/debian/patches/post-9beta2/0196-flacenc-ensure-the-order-is-within-the-min-max-range.patch b/debian/patches/post-9beta2/0196-flacenc-ensure-the-order-is-within-the-min-max-range.patch
index 7a6c30a..b42e96e 100644
--- a/debian/patches/post-9beta2/0196-flacenc-ensure-the-order-is-within-the-min-max-range.patch
+++ b/debian/patches/post-9beta2/0196-flacenc-ensure-the-order-is-within-the-min-max-range.patch
@@ -1,7 +1,7 @@
 From 3a2731cbd31d0c5681ddbc7c78edd5c53c4d0032 Mon Sep 17 00:00:00 2001
 From: Justin Ruggles <justin.ruggles at gmail.com>
 Date: Wed, 7 Nov 2012 14:48:28 -0500
-Subject: [PATCH 196/204] flacenc: ensure the order is within the min/max
+Subject: [PATCH 196/278] flacenc: ensure the order is within the min/max
  range in LPC order search
 
 This fixes use of uninitialized values when the FLAC encoder uses the
diff --git a/debian/patches/post-9beta2/0197-x86-h264_qpel_10bit-port-to-cpuflags.patch b/debian/patches/post-9beta2/0197-x86-h264_qpel_10bit-port-to-cpuflags.patch
index 1d33990..f52183e 100644
--- a/debian/patches/post-9beta2/0197-x86-h264_qpel_10bit-port-to-cpuflags.patch
+++ b/debian/patches/post-9beta2/0197-x86-h264_qpel_10bit-port-to-cpuflags.patch
@@ -1,7 +1,7 @@
 From 4d1f69f2440041b58d5a31bcfcff83ee3c88ac7e Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Mon, 30 Jul 2012 17:04:26 +0200
-Subject: [PATCH 197/204] x86: h264_qpel_10bit: port to cpuflags
+Subject: [PATCH 197/278] x86: h264_qpel_10bit: port to cpuflags
 
 ---
  libavcodec/x86/h264_qpel_10bit.asm |  314 ++++++++++++++++++------------------
diff --git a/debian/patches/post-9beta2/0198-x86-PALIGNR-port-to-cpuflags.patch b/debian/patches/post-9beta2/0198-x86-PALIGNR-port-to-cpuflags.patch
index 294b7bc..c3fa79a 100644
--- a/debian/patches/post-9beta2/0198-x86-PALIGNR-port-to-cpuflags.patch
+++ b/debian/patches/post-9beta2/0198-x86-PALIGNR-port-to-cpuflags.patch
@@ -1,7 +1,7 @@
 From 4b60fac4199680957b15b7a08c5df47e47c6e25e Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Sun, 8 Jul 2012 01:30:30 +0200
-Subject: [PATCH 198/204] x86: PALIGNR: port to cpuflags
+Subject: [PATCH 198/278] x86: PALIGNR: port to cpuflags
 
 ---
  libavcodec/x86/h264_intrapred.asm       |   27 ---------------------------
diff --git a/debian/patches/post-9beta2/0199-x86-h264_qpel_10bit-drop-unused-parameter-from-MC10-.patch b/debian/patches/post-9beta2/0199-x86-h264_qpel_10bit-drop-unused-parameter-from-MC10-.patch
index bb64950..aebfb6c 100644
--- a/debian/patches/post-9beta2/0199-x86-h264_qpel_10bit-drop-unused-parameter-from-MC10-.patch
+++ b/debian/patches/post-9beta2/0199-x86-h264_qpel_10bit-drop-unused-parameter-from-MC10-.patch
@@ -1,7 +1,7 @@
 From 6cd796049dc06eabe1a9714290713bd31024af9e Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Sat, 28 Jul 2012 04:02:09 +0200
-Subject: [PATCH 199/204] x86: h264_qpel_10bit: drop unused parameter from
+Subject: [PATCH 199/278] x86: h264_qpel_10bit: drop unused parameter from
  MC10/MC20/MC30 macros
 
 ---
diff --git a/debian/patches/post-9beta2/0200-x86inc-Set-program_name-outside-of-x86inc.asm.patch b/debian/patches/post-9beta2/0200-x86inc-Set-program_name-outside-of-x86inc.asm.patch
index c405f0c..f6129ed 100644
--- a/debian/patches/post-9beta2/0200-x86inc-Set-program_name-outside-of-x86inc.asm.patch
+++ b/debian/patches/post-9beta2/0200-x86inc-Set-program_name-outside-of-x86inc.asm.patch
@@ -1,7 +1,7 @@
 From f0d124f005ff02dba56b09fdd5fe2a9ba961f650 Mon Sep 17 00:00:00 2001
 From: Diego Biurrun <diego at biurrun.de>
 Date: Tue, 30 Oct 2012 03:21:48 +0100
-Subject: [PATCH 200/204] x86inc: Set program_name outside of x86inc.asm
+Subject: [PATCH 200/278] x86inc: Set program_name outside of x86inc.asm
 
 This reduces the local difference to the x264 upstream version.
 ---
diff --git a/debian/patches/post-9beta2/0201-configure-add-lavu-dependency-to-lavr-lavfi-.pc-file.patch b/debian/patches/post-9beta2/0201-configure-add-lavu-dependency-to-lavr-lavfi-.pc-file.patch
index 4c7b9aa..a5e14d4 100644
--- a/debian/patches/post-9beta2/0201-configure-add-lavu-dependency-to-lavr-lavfi-.pc-file.patch
+++ b/debian/patches/post-9beta2/0201-configure-add-lavu-dependency-to-lavr-lavfi-.pc-file.patch
@@ -1,7 +1,7 @@
 From e5e1a06e443f4994cdeff39e99f67ce2c518ed2a Mon Sep 17 00:00:00 2001
 From: Anton Khirnov <anton at khirnov.net>
 Date: Sat, 3 Nov 2012 08:14:11 +0100
-Subject: [PATCH 201/204] configure: add lavu dependency to lavr/lavfi .pc
+Subject: [PATCH 201/278] configure: add lavu dependency to lavr/lavfi .pc
  files
 
 ---
diff --git a/debian/patches/post-9beta2/0202-mss2-fix-handling-of-unmasked-implicit-WMV9-rectangl.patch b/debian/patches/post-9beta2/0202-mss2-fix-handling-of-unmasked-implicit-WMV9-rectangl.patch
index c3af2b0..fe85ad5 100644
--- a/debian/patches/post-9beta2/0202-mss2-fix-handling-of-unmasked-implicit-WMV9-rectangl.patch
+++ b/debian/patches/post-9beta2/0202-mss2-fix-handling-of-unmasked-implicit-WMV9-rectangl.patch
@@ -1,7 +1,7 @@
 From b077eb07805dc5d139b2f118ddb122cc9df8b87a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Alberto=20Delm=C3=A1s?= <adelmas at gmail.com>
 Date: Sun, 11 Nov 2012 09:23:06 +0100
-Subject: [PATCH 202/204] mss2: fix handling of unmasked implicit WMV9
+Subject: [PATCH 202/278] mss2: fix handling of unmasked implicit WMV9
  rectangles
 
 Signed-off-by: Kostya Shishkov <kostya.shishkov at gmail.com>
diff --git a/debian/patches/post-9beta2/0203-mss2-reindent-after-last-commit.patch b/debian/patches/post-9beta2/0203-mss2-reindent-after-last-commit.patch
index 24a2d34..937a218 100644
--- a/debian/patches/post-9beta2/0203-mss2-reindent-after-last-commit.patch
+++ b/debian/patches/post-9beta2/0203-mss2-reindent-after-last-commit.patch
@@ -1,7 +1,7 @@
 From 6d93308c0ca3783b3278aef8e6e64d8f0558f319 Mon Sep 17 00:00:00 2001
 From: Kostya Shishkov <kostya.shishkov at gmail.com>
 Date: Sun, 11 Nov 2012 15:00:38 +0100
-Subject: [PATCH 203/204] mss2: reindent after last commit
+Subject: [PATCH 203/278] mss2: reindent after last commit
 
 ---
  libavcodec/mss2.c |   68 ++++++++++++++++++++++++++---------------------------
diff --git a/debian/patches/post-9beta2/0204-mss2-prevent-potential-uninitialized-reads.patch b/debian/patches/post-9beta2/0204-mss2-prevent-potential-uninitialized-reads.patch
index f859084..efb3138 100644
--- a/debian/patches/post-9beta2/0204-mss2-prevent-potential-uninitialized-reads.patch
+++ b/debian/patches/post-9beta2/0204-mss2-prevent-potential-uninitialized-reads.patch
@@ -1,7 +1,7 @@
 From 802713c4e7b41bc2deed754d78649945c3442063 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Alberto=20Delm=C3=A1s?= <adelmas at gmail.com>
 Date: Sun, 11 Nov 2012 09:47:39 +0100
-Subject: [PATCH 204/204] mss2: prevent potential uninitialized reads
+Subject: [PATCH 204/278] mss2: prevent potential uninitialized reads
 
 The alternative to zeroing on init is setting the corrupted flag in
 all cases where pal_pic is not fully written, at the cost of added
@@ -12,9 +12,11 @@ Signed-off-by: Kostya Shishkov <kostya.shishkov at gmail.com>
  libavcodec/mss2.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
+diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c
+index 5f99b7a..bec3f45 100644
 --- a/libavcodec/mss2.c
 +++ b/libavcodec/mss2.c
-@@ -839,8 +839,8 @@ static av_cold int mss2_decode_init(AVCo
+@@ -839,8 +839,8 @@ static av_cold int mss2_decode_init(AVCodecContext *avctx)
      if (ret = ff_mss12_decode_init(c, 1, &ctx->sc[0], &ctx->sc[1]))
          return ret;
      c->pal_stride   = c->mask_stride;
@@ -25,14 +27,6 @@ Signed-off-by: Kostya Shishkov <kostya.shishkov at gmail.com>
      if (!c->pal_pic || !c->last_pal_pic) {
          mss2_decode_end(avctx);
          return AVERROR(ENOMEM);
---- a/doc/Doxyfile
-+++ b/doc/Doxyfile
-@@ -616,7 +616,7 @@ RECURSIVE              = YES
- # excluded from the INPUT source files. This way you can easily exclude a
- # subdirectory from a directory tree whose root is specified with the INPUT tag.
- 
--EXCLUDE                =
-+EXCLUDE                = debian debian-shared debian-static debian-cmov .pc .git
- 
- # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
- # directories that are symbolic links (a Unix filesystem feature) are excluded
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0205-lavu-rename-audioconvert.-to-channel_layout.-and-dep.patch b/debian/patches/post-9beta2/0205-lavu-rename-audioconvert.-to-channel_layout.-and-dep.patch
new file mode 100644
index 0000000..8340d71
--- /dev/null
+++ b/debian/patches/post-9beta2/0205-lavu-rename-audioconvert.-to-channel_layout.-and-dep.patch
@@ -0,0 +1,936 @@
+From 5980f5dd18822f29cfd583c9c085c3e77d81aa72 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 10 Nov 2012 09:03:17 -0500
+Subject: [PATCH 205/278] lavu: rename audioconvert.* to channel_layout.* and
+ deprecate audioconvert.h
+
+---
+ doc/APIchanges             |    3 +
+ libavutil/Makefile         |    3 +-
+ libavutil/audioconvert.c   |  231 --------------------------------------------
+ libavutil/audioconvert.h   |  184 +----------------------------------
+ libavutil/channel_layout.c |  231 ++++++++++++++++++++++++++++++++++++++++++++
+ libavutil/channel_layout.h |  182 ++++++++++++++++++++++++++++++++++
+ libavutil/version.h        |    5 +-
+ 7 files changed, 426 insertions(+), 413 deletions(-)
+ delete mode 100644 libavutil/audioconvert.c
+ create mode 100644 libavutil/channel_layout.c
+ create mode 100644 libavutil/channel_layout.h
+
+diff --git a/doc/APIchanges b/doc/APIchanges
+index c8b8fbf..a0756da 100644
+--- a/doc/APIchanges
++++ b/doc/APIchanges
+@@ -13,6 +13,9 @@ libavutil:     2012-10-22
+ 
+ API changes, most recent first:
+ 
++2012-xx-xx - xxxxxxx - lavu 52.2.0 - audioconvert.h
++  Rename audioconvert.h to channel_layout.h. audioconvert.h is now deprecated.
++
+ 2012-xx-xx - xxxxxxx - lavu 52.1.0 - intmath.h
+   Add av_ctz() for trailing zero bit count
+ 
+diff --git a/libavutil/Makefile b/libavutil/Makefile
+index d4ffd5e..48a0e16 100644
+--- a/libavutil/Makefile
++++ b/libavutil/Makefile
+@@ -11,6 +11,7 @@ HEADERS = adler32.h                                                     \
+           base64.h                                                      \
+           blowfish.h                                                    \
+           bswap.h                                                       \
++          channel_layout.h                                              \
+           common.h                                                      \
+           cpu.h                                                         \
+           crc.h                                                         \
+@@ -53,10 +54,10 @@ BUILT_HEADERS = avconfig.h
+ OBJS = adler32.o                                                        \
+        aes.o                                                            \
+        audio_fifo.o                                                     \
+-       audioconvert.o                                                   \
+        avstring.o                                                       \
+        base64.o                                                         \
+        blowfish.o                                                       \
++       channel_layout.o                                                 \
+        cpu.o                                                            \
+        crc.o                                                            \
+        des.o                                                            \
+diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c
+deleted file mode 100644
+index 113b9d7..0000000
+--- a/libavutil/audioconvert.c
++++ /dev/null
+@@ -1,231 +0,0 @@
+-/*
+- * Copyright (c) 2006 Michael Niedermayer <michaelni at gmx.at>
+- *
+- * This file is part of Libav.
+- *
+- * Libav is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2.1 of the License, or (at your option) any later version.
+- *
+- * Libav is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with Libav; if not, write to the Free Software
+- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+- */
+-
+-/**
+- * @file
+- * audio conversion routines
+- */
+-
+-#include "avstring.h"
+-#include "avutil.h"
+-#include "audioconvert.h"
+-#include "common.h"
+-
+-static const char * const channel_names[] = {
+-    [0]  = "FL",        /* front left */
+-    [1]  = "FR",        /* front right */
+-    [2]  = "FC",        /* front center */
+-    [3]  = "LFE",       /* low frequency */
+-    [4]  = "BL",        /* back left */
+-    [5]  = "BR",        /* back right */
+-    [6]  = "FLC",       /* front left-of-center  */
+-    [7]  = "FRC",       /* front right-of-center */
+-    [8]  = "BC",        /* back-center */
+-    [9]  = "SL",        /* side left */
+-    [10] = "SR",        /* side right */
+-    [11] = "TC",        /* top center */
+-    [12] = "TFL",       /* top front left */
+-    [13] = "TFC",       /* top front center */
+-    [14] = "TFR",       /* top front right */
+-    [15] = "TBL",       /* top back left */
+-    [16] = "TBC",       /* top back center */
+-    [17] = "TBR",       /* top back right */
+-    [29] = "DL",        /* downmix left */
+-    [30] = "DR",        /* downmix right */
+-    [31] = "WL",        /* wide left */
+-    [32] = "WR",        /* wide right */
+-    [33] = "SDL",       /* surround direct left */
+-    [34] = "SDR",       /* surround direct right */
+-    [35] = "LFE2",      /* low frequency 2 */
+-};
+-
+-static const char *get_channel_name(int channel_id)
+-{
+-    if (channel_id < 0 || channel_id >= FF_ARRAY_ELEMS(channel_names))
+-        return NULL;
+-    return channel_names[channel_id];
+-}
+-
+-static const struct {
+-    const char *name;
+-    int         nb_channels;
+-    uint64_t     layout;
+-} channel_layout_map[] = {
+-    { "mono",        1,  AV_CH_LAYOUT_MONO },
+-    { "stereo",      2,  AV_CH_LAYOUT_STEREO },
+-    { "stereo",      2,  AV_CH_LAYOUT_STEREO_DOWNMIX },
+-    { "2.1",         3,  AV_CH_LAYOUT_2POINT1 },
+-    { "3.0",         3,  AV_CH_LAYOUT_SURROUND },
+-    { "3.0(back)",   3,  AV_CH_LAYOUT_2_1 },
+-    { "3.1",         4,  AV_CH_LAYOUT_3POINT1 },
+-    { "4.0",         4,  AV_CH_LAYOUT_4POINT0 },
+-    { "quad",        4,  AV_CH_LAYOUT_QUAD },
+-    { "quad(side)",  4,  AV_CH_LAYOUT_2_2 },
+-    { "4.1",         5,  AV_CH_LAYOUT_4POINT1 },
+-    { "5.0",         5,  AV_CH_LAYOUT_5POINT0 },
+-    { "5.0",         5,  AV_CH_LAYOUT_5POINT0_BACK },
+-    { "5.1",         6,  AV_CH_LAYOUT_5POINT1 },
+-    { "5.1",         6,  AV_CH_LAYOUT_5POINT1_BACK },
+-    { "6.0",         6,  AV_CH_LAYOUT_6POINT0 },
+-    { "6.0(front)",  6,  AV_CH_LAYOUT_6POINT0_FRONT },
+-    { "hexagonal",   6,  AV_CH_LAYOUT_HEXAGONAL },
+-    { "6.1",         7,  AV_CH_LAYOUT_6POINT1 },
+-    { "6.1",         7,  AV_CH_LAYOUT_6POINT1_BACK },
+-    { "6.1(front)",  7,  AV_CH_LAYOUT_6POINT1_FRONT },
+-    { "7.0",         7,  AV_CH_LAYOUT_7POINT0 },
+-    { "7.0(front)",  7,  AV_CH_LAYOUT_7POINT0_FRONT },
+-    { "7.1",         8,  AV_CH_LAYOUT_7POINT1 },
+-    { "7.1(wide)",   8,  AV_CH_LAYOUT_7POINT1_WIDE },
+-    { "7.1(wide)",   8,  AV_CH_LAYOUT_7POINT1_WIDE_BACK },
+-    { "octagonal",   8,  AV_CH_LAYOUT_OCTAGONAL },
+-    { "downmix",     2,  AV_CH_LAYOUT_STEREO_DOWNMIX, },
+-    { 0 }
+-};
+-
+-static uint64_t get_channel_layout_single(const char *name, int name_len)
+-{
+-    int i;
+-    char *end;
+-    int64_t layout;
+-
+-    for (i = 0; i < FF_ARRAY_ELEMS(channel_layout_map) - 1; i++) {
+-        if (strlen(channel_layout_map[i].name) == name_len &&
+-            !memcmp(channel_layout_map[i].name, name, name_len))
+-            return channel_layout_map[i].layout;
+-    }
+-    for (i = 0; i < FF_ARRAY_ELEMS(channel_names); i++)
+-        if (channel_names[i] &&
+-            strlen(channel_names[i]) == name_len &&
+-            !memcmp(channel_names[i], name, name_len))
+-            return (int64_t)1 << i;
+-    i = strtol(name, &end, 10);
+-    if (end - name == name_len ||
+-        (end + 1 - name == name_len && *end  == 'c'))
+-        return av_get_default_channel_layout(i);
+-    layout = strtoll(name, &end, 0);
+-    if (end - name == name_len)
+-        return FFMAX(layout, 0);
+-    return 0;
+-}
+-
+-uint64_t av_get_channel_layout(const char *name)
+-{
+-    const char *n, *e;
+-    const char *name_end = name + strlen(name);
+-    int64_t layout = 0, layout_single;
+-
+-    for (n = name; n < name_end; n = e + 1) {
+-        for (e = n; e < name_end && *e != '+' && *e != '|'; e++);
+-        layout_single = get_channel_layout_single(n, e - n);
+-        if (!layout_single)
+-            return 0;
+-        layout |= layout_single;
+-    }
+-    return layout;
+-}
+-
+-void av_get_channel_layout_string(char *buf, int buf_size,
+-                                  int nb_channels, uint64_t channel_layout)
+-{
+-    int i;
+-
+-    if (nb_channels <= 0)
+-        nb_channels = av_get_channel_layout_nb_channels(channel_layout);
+-
+-    for (i = 0; channel_layout_map[i].name; i++)
+-        if (nb_channels    == channel_layout_map[i].nb_channels &&
+-            channel_layout == channel_layout_map[i].layout) {
+-            av_strlcpy(buf, channel_layout_map[i].name, buf_size);
+-            return;
+-        }
+-
+-    snprintf(buf, buf_size, "%d channels", nb_channels);
+-    if (channel_layout) {
+-        int i, ch;
+-        av_strlcat(buf, " (", buf_size);
+-        for (i = 0, ch = 0; i < 64; i++) {
+-            if ((channel_layout & (UINT64_C(1) << i))) {
+-                const char *name = get_channel_name(i);
+-                if (name) {
+-                    if (ch > 0)
+-                        av_strlcat(buf, "|", buf_size);
+-                    av_strlcat(buf, name, buf_size);
+-                }
+-                ch++;
+-            }
+-        }
+-        av_strlcat(buf, ")", buf_size);
+-    }
+-}
+-
+-int av_get_channel_layout_nb_channels(uint64_t channel_layout)
+-{
+-    return av_popcount64(channel_layout);
+-}
+-
+-uint64_t av_get_default_channel_layout(int nb_channels)
+-{
+-    switch(nb_channels) {
+-    case 1: return AV_CH_LAYOUT_MONO;
+-    case 2: return AV_CH_LAYOUT_STEREO;
+-    case 3: return AV_CH_LAYOUT_SURROUND;
+-    case 4: return AV_CH_LAYOUT_QUAD;
+-    case 5: return AV_CH_LAYOUT_5POINT0;
+-    case 6: return AV_CH_LAYOUT_5POINT1;
+-    case 7: return AV_CH_LAYOUT_6POINT1;
+-    case 8: return AV_CH_LAYOUT_7POINT1;
+-    default: return 0;
+-    }
+-}
+-
+-int av_get_channel_layout_channel_index(uint64_t channel_layout,
+-                                        uint64_t channel)
+-{
+-    if (!(channel_layout & channel) ||
+-        av_get_channel_layout_nb_channels(channel) != 1)
+-        return AVERROR(EINVAL);
+-    channel_layout &= channel - 1;
+-    return av_get_channel_layout_nb_channels(channel_layout);
+-}
+-
+-const char *av_get_channel_name(uint64_t channel)
+-{
+-    int i;
+-    if (av_get_channel_layout_nb_channels(channel) != 1)
+-        return NULL;
+-    for (i = 0; i < 64; i++)
+-        if ((1ULL<<i) & channel)
+-            return get_channel_name(i);
+-    return NULL;
+-}
+-
+-uint64_t av_channel_layout_extract_channel(uint64_t channel_layout, int index)
+-{
+-    int i;
+-
+-    if (av_get_channel_layout_nb_channels(channel_layout) <= index)
+-        return 0;
+-
+-    for (i = 0; i < 64; i++) {
+-        if ((1ULL << i) & channel_layout && !index--)
+-            return 1ULL << i;
+-    }
+-    return 0;
+-}
+diff --git a/libavutil/audioconvert.h b/libavutil/audioconvert.h
+index 73076cb..300a67c 100644
+--- a/libavutil/audioconvert.h
++++ b/libavutil/audioconvert.h
+@@ -1,182 +1,6 @@
+-/*
+- * Copyright (c) 2006 Michael Niedermayer <michaelni at gmx.at>
+- * Copyright (c) 2008 Peter Ross
+- *
+- * This file is part of Libav.
+- *
+- * Libav is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2.1 of the License, or (at your option) any later version.
+- *
+- * Libav is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with Libav; if not, write to the Free Software
+- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+- */
+ 
+-#ifndef AVUTIL_AUDIOCONVERT_H
+-#define AVUTIL_AUDIOCONVERT_H
++#include "version.h"
+ 
+-#include <stdint.h>
+-
+-/**
+- * @file
+- * audio conversion routines
+- */
+-
+-/**
+- * @addtogroup lavu_audio
+- * @{
+- */
+-
+-/**
+- * @defgroup channel_masks Audio channel masks
+- * @{
+- */
+-#define AV_CH_FRONT_LEFT             0x00000001
+-#define AV_CH_FRONT_RIGHT            0x00000002
+-#define AV_CH_FRONT_CENTER           0x00000004
+-#define AV_CH_LOW_FREQUENCY          0x00000008
+-#define AV_CH_BACK_LEFT              0x00000010
+-#define AV_CH_BACK_RIGHT             0x00000020
+-#define AV_CH_FRONT_LEFT_OF_CENTER   0x00000040
+-#define AV_CH_FRONT_RIGHT_OF_CENTER  0x00000080
+-#define AV_CH_BACK_CENTER            0x00000100
+-#define AV_CH_SIDE_LEFT              0x00000200
+-#define AV_CH_SIDE_RIGHT             0x00000400
+-#define AV_CH_TOP_CENTER             0x00000800
+-#define AV_CH_TOP_FRONT_LEFT         0x00001000
+-#define AV_CH_TOP_FRONT_CENTER       0x00002000
+-#define AV_CH_TOP_FRONT_RIGHT        0x00004000
+-#define AV_CH_TOP_BACK_LEFT          0x00008000
+-#define AV_CH_TOP_BACK_CENTER        0x00010000
+-#define AV_CH_TOP_BACK_RIGHT         0x00020000
+-#define AV_CH_STEREO_LEFT            0x20000000  ///< Stereo downmix.
+-#define AV_CH_STEREO_RIGHT           0x40000000  ///< See AV_CH_STEREO_LEFT.
+-#define AV_CH_WIDE_LEFT              0x0000000080000000ULL
+-#define AV_CH_WIDE_RIGHT             0x0000000100000000ULL
+-#define AV_CH_SURROUND_DIRECT_LEFT   0x0000000200000000ULL
+-#define AV_CH_SURROUND_DIRECT_RIGHT  0x0000000400000000ULL
+-#define AV_CH_LOW_FREQUENCY_2        0x0000000800000000ULL
+-
+-/** Channel mask value used for AVCodecContext.request_channel_layout
+-    to indicate that the user requests the channel order of the decoder output
+-    to be the native codec channel order. */
+-#define AV_CH_LAYOUT_NATIVE          0x8000000000000000ULL
+-
+-/**
+- * @}
+- * @defgroup channel_mask_c Audio channel convenience macros
+- * @{
+- * */
+-#define AV_CH_LAYOUT_MONO              (AV_CH_FRONT_CENTER)
+-#define AV_CH_LAYOUT_STEREO            (AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT)
+-#define AV_CH_LAYOUT_2POINT1           (AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY)
+-#define AV_CH_LAYOUT_2_1               (AV_CH_LAYOUT_STEREO|AV_CH_BACK_CENTER)
+-#define AV_CH_LAYOUT_SURROUND          (AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER)
+-#define AV_CH_LAYOUT_3POINT1           (AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY)
+-#define AV_CH_LAYOUT_4POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_CENTER)
+-#define AV_CH_LAYOUT_4POINT1           (AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY)
+-#define AV_CH_LAYOUT_2_2               (AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
+-#define AV_CH_LAYOUT_QUAD              (AV_CH_LAYOUT_STEREO|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+-#define AV_CH_LAYOUT_5POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
+-#define AV_CH_LAYOUT_5POINT1           (AV_CH_LAYOUT_5POINT0|AV_CH_LOW_FREQUENCY)
+-#define AV_CH_LAYOUT_5POINT0_BACK      (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+-#define AV_CH_LAYOUT_5POINT1_BACK      (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_LOW_FREQUENCY)
+-#define AV_CH_LAYOUT_6POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_CENTER)
+-#define AV_CH_LAYOUT_6POINT0_FRONT     (AV_CH_LAYOUT_2_2|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+-#define AV_CH_LAYOUT_HEXAGONAL         (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_BACK_CENTER)
+-#define AV_CH_LAYOUT_6POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_CENTER)
+-#define AV_CH_LAYOUT_6POINT1_BACK      (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_BACK_CENTER)
+-#define AV_CH_LAYOUT_6POINT1_FRONT     (AV_CH_LAYOUT_6POINT0_FRONT|AV_CH_LOW_FREQUENCY)
+-#define AV_CH_LAYOUT_7POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+-#define AV_CH_LAYOUT_7POINT0_FRONT     (AV_CH_LAYOUT_5POINT0|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+-#define AV_CH_LAYOUT_7POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+-#define AV_CH_LAYOUT_7POINT1_WIDE      (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+-#define AV_CH_LAYOUT_7POINT1_WIDE_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+-#define AV_CH_LAYOUT_OCTAGONAL         (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT)
+-#define AV_CH_LAYOUT_STEREO_DOWNMIX    (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT)
+-
+-enum AVMatrixEncoding {
+-    AV_MATRIX_ENCODING_NONE,
+-    AV_MATRIX_ENCODING_DOLBY,
+-    AV_MATRIX_ENCODING_DPLII,
+-    AV_MATRIX_ENCODING_NB
+-};
+-
+-/**
+- * @}
+- */
+-
+-/**
+- * Return a channel layout id that matches name, or 0 if no match is found.
+- *
+- * name can be one or several of the following notations,
+- * separated by '+' or '|':
+- * - the name of an usual channel layout (mono, stereo, 4.0, quad, 5.0,
+- *   5.0(side), 5.1, 5.1(side), 7.1, 7.1(wide), downmix);
+- * - the name of a single channel (FL, FR, FC, LFE, BL, BR, FLC, FRC, BC,
+- *   SL, SR, TC, TFL, TFC, TFR, TBL, TBC, TBR, DL, DR);
+- * - a number of channels, in decimal, optionally followed by 'c', yielding
+- *   the default channel layout for that number of channels (@see
+- *   av_get_default_channel_layout);
+- * - a channel layout mask, in hexadecimal starting with "0x" (see the
+- *   AV_CH_* macros).
+- *
+- * Example: "stereo+FC" = "2+FC" = "2c+1c" = "0x7"
+- */
+-uint64_t av_get_channel_layout(const char *name);
+-
+-/**
+- * Return a description of a channel layout.
+- * If nb_channels is <= 0, it is guessed from the channel_layout.
+- *
+- * @param buf put here the string containing the channel layout
+- * @param buf_size size in bytes of the buffer
+- */
+-void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, uint64_t channel_layout);
+-
+-/**
+- * Return the number of channels in the channel layout.
+- */
+-int av_get_channel_layout_nb_channels(uint64_t channel_layout);
+-
+-/**
+- * Return default channel layout for a given number of channels.
+- */
+-uint64_t av_get_default_channel_layout(int nb_channels);
+-
+-/**
+- * Get the index of a channel in channel_layout.
+- *
+- * @param channel a channel layout describing exactly one channel which must be
+- *                present in channel_layout.
+- *
+- * @return index of channel in channel_layout on success, a negative AVERROR
+- *         on error.
+- */
+-int av_get_channel_layout_channel_index(uint64_t channel_layout,
+-                                        uint64_t channel);
+-
+-/**
+- * Get the channel with the given index in channel_layout.
+- */
+-uint64_t av_channel_layout_extract_channel(uint64_t channel_layout, int index);
+-
+-/**
+- * Get the name of a given channel.
+- *
+- * @return channel name on success, NULL on error.
+- */
+-const char *av_get_channel_name(uint64_t channel);
+-
+-/**
+- * @}
+- */
+-
+-#endif /* AVUTIL_AUDIOCONVERT_H */
++#if FF_API_AUDIOCONVERT
++#include "channel_layout.h"
++#endif
+diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c
+new file mode 100644
+index 0000000..79e398e
+--- /dev/null
++++ b/libavutil/channel_layout.c
+@@ -0,0 +1,231 @@
++/*
++ * Copyright (c) 2006 Michael Niedermayer <michaelni at gmx.at>
++ *
++ * This file is part of Libav.
++ *
++ * Libav is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * Libav is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with Libav; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++/**
++ * @file
++ * audio channel layout utility functions
++ */
++
++#include "avstring.h"
++#include "avutil.h"
++#include "channel_layout.h"
++#include "common.h"
++
++static const char * const channel_names[] = {
++    [0]  = "FL",        /* front left */
++    [1]  = "FR",        /* front right */
++    [2]  = "FC",        /* front center */
++    [3]  = "LFE",       /* low frequency */
++    [4]  = "BL",        /* back left */
++    [5]  = "BR",        /* back right */
++    [6]  = "FLC",       /* front left-of-center  */
++    [7]  = "FRC",       /* front right-of-center */
++    [8]  = "BC",        /* back-center */
++    [9]  = "SL",        /* side left */
++    [10] = "SR",        /* side right */
++    [11] = "TC",        /* top center */
++    [12] = "TFL",       /* top front left */
++    [13] = "TFC",       /* top front center */
++    [14] = "TFR",       /* top front right */
++    [15] = "TBL",       /* top back left */
++    [16] = "TBC",       /* top back center */
++    [17] = "TBR",       /* top back right */
++    [29] = "DL",        /* downmix left */
++    [30] = "DR",        /* downmix right */
++    [31] = "WL",        /* wide left */
++    [32] = "WR",        /* wide right */
++    [33] = "SDL",       /* surround direct left */
++    [34] = "SDR",       /* surround direct right */
++    [35] = "LFE2",      /* low frequency 2 */
++};
++
++static const char *get_channel_name(int channel_id)
++{
++    if (channel_id < 0 || channel_id >= FF_ARRAY_ELEMS(channel_names))
++        return NULL;
++    return channel_names[channel_id];
++}
++
++static const struct {
++    const char *name;
++    int         nb_channels;
++    uint64_t     layout;
++} channel_layout_map[] = {
++    { "mono",        1,  AV_CH_LAYOUT_MONO },
++    { "stereo",      2,  AV_CH_LAYOUT_STEREO },
++    { "stereo",      2,  AV_CH_LAYOUT_STEREO_DOWNMIX },
++    { "2.1",         3,  AV_CH_LAYOUT_2POINT1 },
++    { "3.0",         3,  AV_CH_LAYOUT_SURROUND },
++    { "3.0(back)",   3,  AV_CH_LAYOUT_2_1 },
++    { "3.1",         4,  AV_CH_LAYOUT_3POINT1 },
++    { "4.0",         4,  AV_CH_LAYOUT_4POINT0 },
++    { "quad",        4,  AV_CH_LAYOUT_QUAD },
++    { "quad(side)",  4,  AV_CH_LAYOUT_2_2 },
++    { "4.1",         5,  AV_CH_LAYOUT_4POINT1 },
++    { "5.0",         5,  AV_CH_LAYOUT_5POINT0 },
++    { "5.0",         5,  AV_CH_LAYOUT_5POINT0_BACK },
++    { "5.1",         6,  AV_CH_LAYOUT_5POINT1 },
++    { "5.1",         6,  AV_CH_LAYOUT_5POINT1_BACK },
++    { "6.0",         6,  AV_CH_LAYOUT_6POINT0 },
++    { "6.0(front)",  6,  AV_CH_LAYOUT_6POINT0_FRONT },
++    { "hexagonal",   6,  AV_CH_LAYOUT_HEXAGONAL },
++    { "6.1",         7,  AV_CH_LAYOUT_6POINT1 },
++    { "6.1",         7,  AV_CH_LAYOUT_6POINT1_BACK },
++    { "6.1(front)",  7,  AV_CH_LAYOUT_6POINT1_FRONT },
++    { "7.0",         7,  AV_CH_LAYOUT_7POINT0 },
++    { "7.0(front)",  7,  AV_CH_LAYOUT_7POINT0_FRONT },
++    { "7.1",         8,  AV_CH_LAYOUT_7POINT1 },
++    { "7.1(wide)",   8,  AV_CH_LAYOUT_7POINT1_WIDE },
++    { "7.1(wide)",   8,  AV_CH_LAYOUT_7POINT1_WIDE_BACK },
++    { "octagonal",   8,  AV_CH_LAYOUT_OCTAGONAL },
++    { "downmix",     2,  AV_CH_LAYOUT_STEREO_DOWNMIX, },
++    { 0 }
++};
++
++static uint64_t get_channel_layout_single(const char *name, int name_len)
++{
++    int i;
++    char *end;
++    int64_t layout;
++
++    for (i = 0; i < FF_ARRAY_ELEMS(channel_layout_map) - 1; i++) {
++        if (strlen(channel_layout_map[i].name) == name_len &&
++            !memcmp(channel_layout_map[i].name, name, name_len))
++            return channel_layout_map[i].layout;
++    }
++    for (i = 0; i < FF_ARRAY_ELEMS(channel_names); i++)
++        if (channel_names[i] &&
++            strlen(channel_names[i]) == name_len &&
++            !memcmp(channel_names[i], name, name_len))
++            return (int64_t)1 << i;
++    i = strtol(name, &end, 10);
++    if (end - name == name_len ||
++        (end + 1 - name == name_len && *end  == 'c'))
++        return av_get_default_channel_layout(i);
++    layout = strtoll(name, &end, 0);
++    if (end - name == name_len)
++        return FFMAX(layout, 0);
++    return 0;
++}
++
++uint64_t av_get_channel_layout(const char *name)
++{
++    const char *n, *e;
++    const char *name_end = name + strlen(name);
++    int64_t layout = 0, layout_single;
++
++    for (n = name; n < name_end; n = e + 1) {
++        for (e = n; e < name_end && *e != '+' && *e != '|'; e++);
++        layout_single = get_channel_layout_single(n, e - n);
++        if (!layout_single)
++            return 0;
++        layout |= layout_single;
++    }
++    return layout;
++}
++
++void av_get_channel_layout_string(char *buf, int buf_size,
++                                  int nb_channels, uint64_t channel_layout)
++{
++    int i;
++
++    if (nb_channels <= 0)
++        nb_channels = av_get_channel_layout_nb_channels(channel_layout);
++
++    for (i = 0; channel_layout_map[i].name; i++)
++        if (nb_channels    == channel_layout_map[i].nb_channels &&
++            channel_layout == channel_layout_map[i].layout) {
++            av_strlcpy(buf, channel_layout_map[i].name, buf_size);
++            return;
++        }
++
++    snprintf(buf, buf_size, "%d channels", nb_channels);
++    if (channel_layout) {
++        int i, ch;
++        av_strlcat(buf, " (", buf_size);
++        for (i = 0, ch = 0; i < 64; i++) {
++            if ((channel_layout & (UINT64_C(1) << i))) {
++                const char *name = get_channel_name(i);
++                if (name) {
++                    if (ch > 0)
++                        av_strlcat(buf, "|", buf_size);
++                    av_strlcat(buf, name, buf_size);
++                }
++                ch++;
++            }
++        }
++        av_strlcat(buf, ")", buf_size);
++    }
++}
++
++int av_get_channel_layout_nb_channels(uint64_t channel_layout)
++{
++    return av_popcount64(channel_layout);
++}
++
++uint64_t av_get_default_channel_layout(int nb_channels)
++{
++    switch(nb_channels) {
++    case 1: return AV_CH_LAYOUT_MONO;
++    case 2: return AV_CH_LAYOUT_STEREO;
++    case 3: return AV_CH_LAYOUT_SURROUND;
++    case 4: return AV_CH_LAYOUT_QUAD;
++    case 5: return AV_CH_LAYOUT_5POINT0;
++    case 6: return AV_CH_LAYOUT_5POINT1;
++    case 7: return AV_CH_LAYOUT_6POINT1;
++    case 8: return AV_CH_LAYOUT_7POINT1;
++    default: return 0;
++    }
++}
++
++int av_get_channel_layout_channel_index(uint64_t channel_layout,
++                                        uint64_t channel)
++{
++    if (!(channel_layout & channel) ||
++        av_get_channel_layout_nb_channels(channel) != 1)
++        return AVERROR(EINVAL);
++    channel_layout &= channel - 1;
++    return av_get_channel_layout_nb_channels(channel_layout);
++}
++
++const char *av_get_channel_name(uint64_t channel)
++{
++    int i;
++    if (av_get_channel_layout_nb_channels(channel) != 1)
++        return NULL;
++    for (i = 0; i < 64; i++)
++        if ((1ULL<<i) & channel)
++            return get_channel_name(i);
++    return NULL;
++}
++
++uint64_t av_channel_layout_extract_channel(uint64_t channel_layout, int index)
++{
++    int i;
++
++    if (av_get_channel_layout_nb_channels(channel_layout) <= index)
++        return 0;
++
++    for (i = 0; i < 64; i++) {
++        if ((1ULL << i) & channel_layout && !index--)
++            return 1ULL << i;
++    }
++    return 0;
++}
+diff --git a/libavutil/channel_layout.h b/libavutil/channel_layout.h
+new file mode 100644
+index 0000000..15b6887
+--- /dev/null
++++ b/libavutil/channel_layout.h
+@@ -0,0 +1,182 @@
++/*
++ * Copyright (c) 2006 Michael Niedermayer <michaelni at gmx.at>
++ * Copyright (c) 2008 Peter Ross
++ *
++ * This file is part of Libav.
++ *
++ * Libav is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * Libav is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with Libav; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++#ifndef AVUTIL_CHANNEL_LAYOUT_H
++#define AVUTIL_CHANNEL_LAYOUT_H
++
++#include <stdint.h>
++
++/**
++ * @file
++ * audio channel layout utility functions
++ */
++
++/**
++ * @addtogroup lavu_audio
++ * @{
++ */
++
++/**
++ * @defgroup channel_masks Audio channel masks
++ * @{
++ */
++#define AV_CH_FRONT_LEFT             0x00000001
++#define AV_CH_FRONT_RIGHT            0x00000002
++#define AV_CH_FRONT_CENTER           0x00000004
++#define AV_CH_LOW_FREQUENCY          0x00000008
++#define AV_CH_BACK_LEFT              0x00000010
++#define AV_CH_BACK_RIGHT             0x00000020
++#define AV_CH_FRONT_LEFT_OF_CENTER   0x00000040
++#define AV_CH_FRONT_RIGHT_OF_CENTER  0x00000080
++#define AV_CH_BACK_CENTER            0x00000100
++#define AV_CH_SIDE_LEFT              0x00000200
++#define AV_CH_SIDE_RIGHT             0x00000400
++#define AV_CH_TOP_CENTER             0x00000800
++#define AV_CH_TOP_FRONT_LEFT         0x00001000
++#define AV_CH_TOP_FRONT_CENTER       0x00002000
++#define AV_CH_TOP_FRONT_RIGHT        0x00004000
++#define AV_CH_TOP_BACK_LEFT          0x00008000
++#define AV_CH_TOP_BACK_CENTER        0x00010000
++#define AV_CH_TOP_BACK_RIGHT         0x00020000
++#define AV_CH_STEREO_LEFT            0x20000000  ///< Stereo downmix.
++#define AV_CH_STEREO_RIGHT           0x40000000  ///< See AV_CH_STEREO_LEFT.
++#define AV_CH_WIDE_LEFT              0x0000000080000000ULL
++#define AV_CH_WIDE_RIGHT             0x0000000100000000ULL
++#define AV_CH_SURROUND_DIRECT_LEFT   0x0000000200000000ULL
++#define AV_CH_SURROUND_DIRECT_RIGHT  0x0000000400000000ULL
++#define AV_CH_LOW_FREQUENCY_2        0x0000000800000000ULL
++
++/** Channel mask value used for AVCodecContext.request_channel_layout
++    to indicate that the user requests the channel order of the decoder output
++    to be the native codec channel order. */
++#define AV_CH_LAYOUT_NATIVE          0x8000000000000000ULL
++
++/**
++ * @}
++ * @defgroup channel_mask_c Audio channel convenience macros
++ * @{
++ * */
++#define AV_CH_LAYOUT_MONO              (AV_CH_FRONT_CENTER)
++#define AV_CH_LAYOUT_STEREO            (AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT)
++#define AV_CH_LAYOUT_2POINT1           (AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY)
++#define AV_CH_LAYOUT_2_1               (AV_CH_LAYOUT_STEREO|AV_CH_BACK_CENTER)
++#define AV_CH_LAYOUT_SURROUND          (AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER)
++#define AV_CH_LAYOUT_3POINT1           (AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY)
++#define AV_CH_LAYOUT_4POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_CENTER)
++#define AV_CH_LAYOUT_4POINT1           (AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY)
++#define AV_CH_LAYOUT_2_2               (AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
++#define AV_CH_LAYOUT_QUAD              (AV_CH_LAYOUT_STEREO|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
++#define AV_CH_LAYOUT_5POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
++#define AV_CH_LAYOUT_5POINT1           (AV_CH_LAYOUT_5POINT0|AV_CH_LOW_FREQUENCY)
++#define AV_CH_LAYOUT_5POINT0_BACK      (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
++#define AV_CH_LAYOUT_5POINT1_BACK      (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_LOW_FREQUENCY)
++#define AV_CH_LAYOUT_6POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_CENTER)
++#define AV_CH_LAYOUT_6POINT0_FRONT     (AV_CH_LAYOUT_2_2|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
++#define AV_CH_LAYOUT_HEXAGONAL         (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_BACK_CENTER)
++#define AV_CH_LAYOUT_6POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_CENTER)
++#define AV_CH_LAYOUT_6POINT1_BACK      (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_BACK_CENTER)
++#define AV_CH_LAYOUT_6POINT1_FRONT     (AV_CH_LAYOUT_6POINT0_FRONT|AV_CH_LOW_FREQUENCY)
++#define AV_CH_LAYOUT_7POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
++#define AV_CH_LAYOUT_7POINT0_FRONT     (AV_CH_LAYOUT_5POINT0|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
++#define AV_CH_LAYOUT_7POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
++#define AV_CH_LAYOUT_7POINT1_WIDE      (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
++#define AV_CH_LAYOUT_7POINT1_WIDE_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
++#define AV_CH_LAYOUT_OCTAGONAL         (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT)
++#define AV_CH_LAYOUT_STEREO_DOWNMIX    (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT)
++
++enum AVMatrixEncoding {
++    AV_MATRIX_ENCODING_NONE,
++    AV_MATRIX_ENCODING_DOLBY,
++    AV_MATRIX_ENCODING_DPLII,
++    AV_MATRIX_ENCODING_NB
++};
++
++/**
++ * @}
++ */
++
++/**
++ * Return a channel layout id that matches name, or 0 if no match is found.
++ *
++ * name can be one or several of the following notations,
++ * separated by '+' or '|':
++ * - the name of an usual channel layout (mono, stereo, 4.0, quad, 5.0,
++ *   5.0(side), 5.1, 5.1(side), 7.1, 7.1(wide), downmix);
++ * - the name of a single channel (FL, FR, FC, LFE, BL, BR, FLC, FRC, BC,
++ *   SL, SR, TC, TFL, TFC, TFR, TBL, TBC, TBR, DL, DR);
++ * - a number of channels, in decimal, optionally followed by 'c', yielding
++ *   the default channel layout for that number of channels (@see
++ *   av_get_default_channel_layout);
++ * - a channel layout mask, in hexadecimal starting with "0x" (see the
++ *   AV_CH_* macros).
++ *
++ * Example: "stereo+FC" = "2+FC" = "2c+1c" = "0x7"
++ */
++uint64_t av_get_channel_layout(const char *name);
++
++/**
++ * Return a description of a channel layout.
++ * If nb_channels is <= 0, it is guessed from the channel_layout.
++ *
++ * @param buf put here the string containing the channel layout
++ * @param buf_size size in bytes of the buffer
++ */
++void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, uint64_t channel_layout);
++
++/**
++ * Return the number of channels in the channel layout.
++ */
++int av_get_channel_layout_nb_channels(uint64_t channel_layout);
++
++/**
++ * Return default channel layout for a given number of channels.
++ */
++uint64_t av_get_default_channel_layout(int nb_channels);
++
++/**
++ * Get the index of a channel in channel_layout.
++ *
++ * @param channel a channel layout describing exactly one channel which must be
++ *                present in channel_layout.
++ *
++ * @return index of channel in channel_layout on success, a negative AVERROR
++ *         on error.
++ */
++int av_get_channel_layout_channel_index(uint64_t channel_layout,
++                                        uint64_t channel);
++
++/**
++ * Get the channel with the given index in channel_layout.
++ */
++uint64_t av_channel_layout_extract_channel(uint64_t channel_layout, int index);
++
++/**
++ * Get the name of a given channel.
++ *
++ * @return channel name on success, NULL on error.
++ */
++const char *av_get_channel_name(uint64_t channel);
++
++/**
++ * @}
++ */
++
++#endif /* AVUTIL_CHANNEL_LAYOUT_H */
+diff --git a/libavutil/version.h b/libavutil/version.h
+index 1659dbd..6f79eeb 100644
+--- a/libavutil/version.h
++++ b/libavutil/version.h
+@@ -37,7 +37,7 @@
+  */
+ 
+ #define LIBAVUTIL_VERSION_MAJOR 52
+-#define LIBAVUTIL_VERSION_MINOR  1
++#define LIBAVUTIL_VERSION_MINOR  2
+ #define LIBAVUTIL_VERSION_MICRO  0
+ 
+ #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
+@@ -73,6 +73,9 @@
+ #ifndef FF_API_AV_REVERSE
+ #define FF_API_AV_REVERSE               (LIBAVUTIL_VERSION_MAJOR < 53)
+ #endif
++#ifndef FF_API_AUDIOCONVERT
++#define FF_API_AUDIOCONVERT             (LIBAVUTIL_VERSION_MAJOR < 53)
++#endif
+ 
+ /**
+  * @}
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0206-Include-libavutil-channel_layout.h-instead-of-libavu.patch b/debian/patches/post-9beta2/0206-Include-libavutil-channel_layout.h-instead-of-libavu.patch
new file mode 100644
index 0000000..c77bb1e
--- /dev/null
+++ b/debian/patches/post-9beta2/0206-Include-libavutil-channel_layout.h-instead-of-libavu.patch
@@ -0,0 +1,1266 @@
+From a903f8f087b0bdcc5643054147f3a5f278e7eb99 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 10 Nov 2012 10:00:00 -0500
+Subject: [PATCH 206/278] Include libavutil/channel_layout.h instead of
+ libavutil/audioconvert.h
+
+Also reorder some other #include when applicable.
+---
+ avconv.c                        |    2 +-
+ avconv_filter.c                 |    2 +-
+ avconv_opt.c                    |    2 +-
+ doc/filters.texi                |    2 +-
+ libavcodec/aacdectab.h          |    2 +-
+ libavcodec/ac3_parser.c         |    2 +-
+ libavcodec/ac3enc.c             |    3 +--
+ libavcodec/ac3tab.c             |    2 +-
+ libavcodec/alac.c               |    2 +-
+ libavcodec/amrnbdec.c           |    2 +-
+ libavcodec/amrwbdec.c           |    2 +-
+ libavcodec/apedec.c             |    6 +++---
+ libavcodec/api-example.c        |    2 +-
+ libavcodec/audioconvert.h       |    2 +-
+ libavcodec/bmv.c                |    2 +-
+ libavcodec/cook.c               |    2 +-
+ libavcodec/dcadec.c             |    2 +-
+ libavcodec/dsicinav.c           |    2 +-
+ libavcodec/flac.c               |    2 +-
+ libavcodec/flacdec.c            |    2 +-
+ libavcodec/g722dec.c            |    4 ++--
+ libavcodec/g723_1.c             |    2 +-
+ libavcodec/g726.c               |    2 +-
+ libavcodec/gsmdec.c             |    2 +-
+ libavcodec/imc.c                |    2 +-
+ libavcodec/libfaac.c            |    4 ++--
+ libavcodec/libfdk-aacenc.c      |    6 +++---
+ libavcodec/libgsm.c             |    4 ++--
+ libavcodec/libilbc.c            |    4 ++--
+ libavcodec/libmp3lame.c         |    2 +-
+ libavcodec/libopencore-amr.c    |    4 ++--
+ libavcodec/libspeexdec.c        |    2 +-
+ libavcodec/libspeexenc.c        |    2 +-
+ libavcodec/mlp_parser.c         |    2 +-
+ libavcodec/mpc7.c               |    2 +-
+ libavcodec/mpc8.c               |    2 +-
+ libavcodec/mpegaudiodec.c       |    2 +-
+ libavcodec/mpegaudioenc.c       |    2 +-
+ libavcodec/nellymoserdec.c      |    4 ++--
+ libavcodec/pcm-mpeg.c           |    2 +-
+ libavcodec/qcelpdec.c           |    2 +-
+ libavcodec/qdm2.c               |    2 +-
+ libavcodec/ra144dec.c           |    2 +-
+ libavcodec/ra288.c              |    2 +-
+ libavcodec/ralf.c               |    2 +-
+ libavcodec/sipr.c               |    2 +-
+ libavcodec/smacker.c            |    2 +-
+ libavcodec/truespeech.c         |    2 +-
+ libavcodec/twinvq.c             |    2 +-
+ libavcodec/utils.c              |    3 +--
+ libavcodec/vmdav.c              |    2 +-
+ libavcodec/vorbis_data.c        |    4 ++--
+ libavcodec/wavpack.c            |    2 +-
+ libavcodec/wmavoice.c           |    2 +-
+ libavcodec/ws-snd1.c            |    2 +-
+ libavdevice/alsa-audio-common.c |    2 +-
+ libavfilter/af_aformat.c        |    2 +-
+ libavfilter/af_amix.c           |    2 +-
+ libavfilter/af_ashowinfo.c      |    2 +-
+ libavfilter/af_channelmap.c     |    2 +-
+ libavfilter/af_channelsplit.c   |    2 +-
+ libavfilter/af_join.c           |    2 +-
+ libavfilter/asrc_anullsrc.c     |    4 ++--
+ libavfilter/audio.c             |    2 +-
+ libavfilter/avfilter.c          |    2 +-
+ libavfilter/avfilter.h          |    2 +-
+ libavfilter/avfiltergraph.c     |    9 ++++-----
+ libavfilter/buffer.c            |    2 +-
+ libavfilter/buffersink.c        |    2 +-
+ libavfilter/buffersrc.c         |   13 ++++++-------
+ libavfilter/fifo.c              |    2 +-
+ libavformat/aea.c               |    4 ++--
+ libavformat/flic.c              |    2 +-
+ libavformat/g723_1.c            |    2 +-
+ libavformat/mov.c               |    2 +-
+ libavformat/mov_chan.c          |    2 +-
+ libavformat/wv.c                |    2 +-
+ libavresample/avresample.h      |    2 +-
+ 78 files changed, 99 insertions(+), 103 deletions(-)
+
+diff --git a/avconv.c b/avconv.c
+index c931c46..b2e1f04 100644
+--- a/avconv.c
++++ b/avconv.c
+@@ -32,7 +32,7 @@
+ #include "libswscale/swscale.h"
+ #include "libavresample/avresample.h"
+ #include "libavutil/opt.h"
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/parseutils.h"
+ #include "libavutil/samplefmt.h"
+ #include "libavutil/colorspace.h"
+diff --git a/avconv_filter.c b/avconv_filter.c
+index 8f3f912..f51e3e1 100644
+--- a/avconv_filter.c
++++ b/avconv_filter.c
+@@ -23,8 +23,8 @@
+ #include "libavfilter/avfilter.h"
+ #include "libavfilter/avfiltergraph.h"
+ 
+-#include "libavutil/audioconvert.h"
+ #include "libavutil/avassert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/pixdesc.h"
+ #include "libavutil/pixfmt.h"
+ #include "libavutil/samplefmt.h"
+diff --git a/avconv_opt.c b/avconv_opt.c
+index ffb6c65..0354454 100644
+--- a/avconv_opt.c
++++ b/avconv_opt.c
+@@ -30,10 +30,10 @@
+ #include "libavfilter/avfilter.h"
+ #include "libavfilter/avfiltergraph.h"
+ 
+-#include "libavutil/audioconvert.h"
+ #include "libavutil/avassert.h"
+ #include "libavutil/avstring.h"
+ #include "libavutil/avutil.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "libavutil/fifo.h"
+ #include "libavutil/mathematics.h"
+diff --git a/doc/filters.texi b/doc/filters.texi
+index 85c8ae0..e1da2fe 100644
+--- a/doc/filters.texi
++++ b/doc/filters.texi
+@@ -381,7 +381,7 @@ integer or a string representing a channel layout. The default value
+ of @var{channel_layout} is 3, which corresponds to CH_LAYOUT_STEREO.
+ 
+ Check the channel_layout_map definition in
+- at file{libavcodec/audioconvert.c} for the mapping between strings and
++ at file{libavutil/channel_layout.c} for the mapping between strings and
+ channel layout values.
+ 
+ Follow some examples:
+diff --git a/libavcodec/aacdectab.h b/libavcodec/aacdectab.h
+index 844579f..4c23f2d 100644
+--- a/libavcodec/aacdectab.h
++++ b/libavcodec/aacdectab.h
+@@ -30,7 +30,7 @@
+ #ifndef AVCODEC_AACDECTAB_H
+ #define AVCODEC_AACDECTAB_H
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "aac.h"
+ 
+ #include <stdint.h>
+diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c
+index 9786da3..4abcf16 100644
+--- a/libavcodec/ac3_parser.c
++++ b/libavcodec/ac3_parser.c
+@@ -20,11 +20,11 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "parser.h"
+ #include "ac3_parser.h"
+ #include "aac_ac3_parser.h"
+ #include "get_bits.h"
+-#include "libavutil/audioconvert.h"
+ 
+ 
+ #define AC3_HEADER_SIZE 7
+diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
+index 5102e30..6d038ef 100644
+--- a/libavcodec/ac3enc.c
++++ b/libavcodec/ac3enc.c
+@@ -30,9 +30,9 @@
+ 
+ #include <stdint.h>
+ 
+-#include "libavutil/audioconvert.h"
+ #include "libavutil/avassert.h"
+ #include "libavutil/avstring.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/crc.h"
+ #include "libavutil/opt.h"
+ #include "avcodec.h"
+@@ -40,7 +40,6 @@
+ #include "dsputil.h"
+ #include "ac3dsp.h"
+ #include "ac3.h"
+-#include "audioconvert.h"
+ #include "fft.h"
+ #include "ac3enc.h"
+ #include "eac3enc.h"
+diff --git a/libavcodec/ac3tab.c b/libavcodec/ac3tab.c
+index 951a101..ebcfb0b 100644
+--- a/libavcodec/ac3tab.c
++++ b/libavcodec/ac3tab.c
+@@ -24,7 +24,7 @@
+  * tables taken directly from the AC-3 spec.
+  */
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "avcodec.h"
+ #include "ac3tab.h"
+ 
+diff --git a/libavcodec/alac.c b/libavcodec/alac.c
+index 80f6863..242e531 100644
+--- a/libavcodec/alac.c
++++ b/libavcodec/alac.c
+@@ -45,7 +45,7 @@
+  * 32bit  samplerate
+  */
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "avcodec.h"
+ #include "get_bits.h"
+ #include "bytestream.h"
+diff --git a/libavcodec/amrnbdec.c b/libavcodec/amrnbdec.c
+index 2196645..ccf1b0c 100644
+--- a/libavcodec/amrnbdec.c
++++ b/libavcodec/amrnbdec.c
+@@ -43,7 +43,7 @@
+ #include <string.h>
+ #include <math.h>
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "avcodec.h"
+ #include "dsputil.h"
+ #include "libavutil/common.h"
+diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c
+index 9b0fe25..43ac0c3 100644
+--- a/libavcodec/amrwbdec.c
++++ b/libavcodec/amrwbdec.c
+@@ -24,7 +24,7 @@
+  * AMR wideband decoder
+  */
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ #include "libavutil/lfg.h"
+ 
+diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
+index 9d2941c..7a6ee41 100644
+--- a/libavcodec/apedec.c
++++ b/libavcodec/apedec.c
+@@ -20,12 +20,12 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include "libavutil/avassert.h"
++#include "libavutil/channel_layout.h"
++#include "libavutil/opt.h"
+ #include "avcodec.h"
+ #include "dsputil.h"
+ #include "bytestream.h"
+-#include "libavutil/audioconvert.h"
+-#include "libavutil/avassert.h"
+-#include "libavutil/opt.h"
+ 
+ /**
+  * @file
+diff --git a/libavcodec/api-example.c b/libavcodec/api-example.c
+index 198a59d..949b3ef 100644
+--- a/libavcodec/api-example.c
++++ b/libavcodec/api-example.c
+@@ -37,7 +37,7 @@
+ #endif
+ 
+ #include "libavcodec/avcodec.h"
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ #include "libavutil/imgutils.h"
+ #include "libavutil/mathematics.h"
+diff --git a/libavcodec/audioconvert.h b/libavcodec/audioconvert.h
+index a7b0baa..7d76fd6 100644
+--- a/libavcodec/audioconvert.h
++++ b/libavcodec/audioconvert.h
+@@ -31,7 +31,7 @@
+ 
+ #include "libavutil/cpu.h"
+ #include "avcodec.h"
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ 
+ struct AVAudioConvert;
+ typedef struct AVAudioConvert AVAudioConvert;
+diff --git a/libavcodec/bmv.c b/libavcodec/bmv.c
+index 53781e7..3ff6177 100644
+--- a/libavcodec/bmv.c
++++ b/libavcodec/bmv.c
+@@ -19,7 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "avcodec.h"
+ #include "bytestream.h"
+ 
+diff --git a/libavcodec/cook.c b/libavcodec/cook.c
+index 201b44c..f41457d 100644
+--- a/libavcodec/cook.c
++++ b/libavcodec/cook.c
+@@ -42,13 +42,13 @@
+  * available.
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/lfg.h"
+ #include "avcodec.h"
+ #include "get_bits.h"
+ #include "dsputil.h"
+ #include "bytestream.h"
+ #include "fft.h"
+-#include "libavutil/audioconvert.h"
+ #include "sinewin.h"
+ 
+ #include "cookdata.h"
+diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
+index 026c572..712a72a 100644
+--- a/libavcodec/dcadec.c
++++ b/libavcodec/dcadec.c
+@@ -26,12 +26,12 @@
+ #include <stddef.h>
+ #include <stdio.h>
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ #include "libavutil/float_dsp.h"
+ #include "libavutil/intmath.h"
+ #include "libavutil/intreadwrite.h"
+ #include "libavutil/mathematics.h"
+-#include "libavutil/audioconvert.h"
+ #include "libavutil/samplefmt.h"
+ #include "avcodec.h"
+ #include "dsputil.h"
+diff --git a/libavcodec/dsicinav.c b/libavcodec/dsicinav.c
+index 2dcbf74..4874aa3 100644
+--- a/libavcodec/dsicinav.c
++++ b/libavcodec/dsicinav.c
+@@ -24,7 +24,7 @@
+  * Delphine Software International CIN audio/video decoders
+  */
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "avcodec.h"
+ #include "bytestream.h"
+ #include "mathops.h"
+diff --git a/libavcodec/flac.c b/libavcodec/flac.c
+index 07da702..32b28d0 100644
+--- a/libavcodec/flac.c
++++ b/libavcodec/flac.c
+@@ -19,7 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/crc.h"
+ #include "libavutil/log.h"
+ #include "bytestream.h"
+diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
+index 10e33f2..6b290e2 100644
+--- a/libavcodec/flacdec.c
++++ b/libavcodec/flacdec.c
+@@ -33,7 +33,7 @@
+ 
+ #include <limits.h>
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/crc.h"
+ #include "avcodec.h"
+ #include "internal.h"
+diff --git a/libavcodec/g722dec.c b/libavcodec/g722dec.c
+index 3364850..55a23d1 100644
+--- a/libavcodec/g722dec.c
++++ b/libavcodec/g722dec.c
+@@ -34,11 +34,11 @@
+  *       respectively of each byte are ignored.
+  */
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
++#include "libavutil/opt.h"
+ #include "avcodec.h"
+ #include "get_bits.h"
+ #include "g722.h"
+-#include "libavutil/opt.h"
+ 
+ #define OFFSET(x) offsetof(G722Context, x)
+ #define AD AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM
+diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c
+index 342c634..fe88682 100644
+--- a/libavcodec/g723_1.c
++++ b/libavcodec/g723_1.c
+@@ -26,7 +26,7 @@
+  */
+ 
+ #define BITSTREAM_READER_LE
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/mem.h"
+ #include "libavutil/opt.h"
+ #include "avcodec.h"
+diff --git a/libavcodec/g726.c b/libavcodec/g726.c
+index 91b5e54..402ae3d 100644
+--- a/libavcodec/g726.c
++++ b/libavcodec/g726.c
+@@ -23,8 +23,8 @@
+  */
+ #include <limits.h>
+ 
+-#include "libavutil/audioconvert.h"
+ #include "libavutil/avassert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/opt.h"
+ #include "avcodec.h"
+ #include "internal.h"
+diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c
+index 14b7e03..06e6c33 100644
+--- a/libavcodec/gsmdec.c
++++ b/libavcodec/gsmdec.c
+@@ -24,7 +24,7 @@
+  * GSM decoder
+  */
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "avcodec.h"
+ #include "get_bits.h"
+ #include "msgsmdec.h"
+diff --git a/libavcodec/imc.c b/libavcodec/imc.c
+index 4c2d01d..ea6172b 100644
+--- a/libavcodec/imc.c
++++ b/libavcodec/imc.c
+@@ -35,11 +35,11 @@
+ #include <stddef.h>
+ #include <stdio.h>
+ 
++#include "libavutil/channel_layout.h"
+ #include "avcodec.h"
+ #include "get_bits.h"
+ #include "dsputil.h"
+ #include "fft.h"
+-#include "libavutil/audioconvert.h"
+ #include "sinewin.h"
+ 
+ #include "imcdata.h"
+diff --git a/libavcodec/libfaac.c b/libavcodec/libfaac.c
+index 7297179..24f3bf2 100644
+--- a/libavcodec/libfaac.c
++++ b/libavcodec/libfaac.c
+@@ -26,11 +26,11 @@
+ 
+ #include <faac.h>
+ 
++#include "libavutil/channel_layout.h"
++#include "libavutil/common.h"
+ #include "avcodec.h"
+ #include "audio_frame_queue.h"
+ #include "internal.h"
+-#include "libavutil/audioconvert.h"
+-#include "libavutil/common.h"
+ 
+ 
+ /* libfaac has an encoder delay of 1024 samples */
+diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c
+index fada1c2..85ccb10 100644
+--- a/libavcodec/libfdk-aacenc.c
++++ b/libavcodec/libfdk-aacenc.c
+@@ -21,12 +21,12 @@
+ 
+ #include <fdk-aac/aacenc_lib.h>
+ 
++#include "libavutil/channel_layout.h"
++#include "libavutil/common.h"
++#include "libavutil/opt.h"
+ #include "avcodec.h"
+ #include "audio_frame_queue.h"
+ #include "internal.h"
+-#include "libavutil/audioconvert.h"
+-#include "libavutil/common.h"
+-#include "libavutil/opt.h"
+ 
+ typedef struct AACContext {
+     const AVClass *class;
+diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c
+index afed710..55697db 100644
+--- a/libavcodec/libgsm.c
++++ b/libavcodec/libgsm.c
+@@ -29,11 +29,11 @@
+ 
+ #include <gsm/gsm.h>
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
++#include "libavutil/common.h"
+ #include "avcodec.h"
+ #include "internal.h"
+ #include "gsm.h"
+-#include "libavutil/common.h"
+ 
+ static av_cold int libgsm_encode_init(AVCodecContext *avctx) {
+     if (avctx->channels > 1) {
+diff --git a/libavcodec/libilbc.c b/libavcodec/libilbc.c
+index 2812061..450f413 100644
+--- a/libavcodec/libilbc.c
++++ b/libavcodec/libilbc.c
+@@ -21,10 +21,10 @@
+ 
+ #include <ilbc.h>
+ 
+-#include "libavutil/audioconvert.h"
+-#include "avcodec.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ #include "libavutil/opt.h"
++#include "avcodec.h"
+ #include "internal.h"
+ 
+ static int get_mode(AVCodecContext *avctx)
+diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c
+index 947edc0..600f6fd 100644
+--- a/libavcodec/libmp3lame.c
++++ b/libavcodec/libmp3lame.c
+@@ -26,7 +26,7 @@
+ 
+ #include <lame/lame.h>
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ #include "libavutil/intreadwrite.h"
+ #include "libavutil/log.h"
+diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c
+index 0c472b7..006c852 100644
+--- a/libavcodec/libopencore-amr.c
++++ b/libavcodec/libopencore-amr.c
+@@ -19,11 +19,11 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+-#include "libavutil/audioconvert.h"
+-#include "avcodec.h"
+ #include "libavutil/avstring.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ #include "libavutil/opt.h"
++#include "avcodec.h"
+ #include "audio_frame_queue.h"
+ #include "internal.h"
+ 
+diff --git a/libavcodec/libspeexdec.c b/libavcodec/libspeexdec.c
+index 0c93f05..e9442f4 100644
+--- a/libavcodec/libspeexdec.c
++++ b/libavcodec/libspeexdec.c
+@@ -23,7 +23,7 @@
+ #include <speex/speex_stereo.h>
+ #include <speex/speex_callbacks.h>
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ #include "avcodec.h"
+ 
+diff --git a/libavcodec/libspeexenc.c b/libavcodec/libspeexenc.c
+index cbfa5be..e30185a 100644
+--- a/libavcodec/libspeexenc.c
++++ b/libavcodec/libspeexenc.c
+@@ -85,7 +85,7 @@
+ #include <speex/speex_header.h>
+ #include <speex/speex_stereo.h>
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ #include "libavutil/opt.h"
+ #include "avcodec.h"
+diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c
+index 4c1cf9b..d1a3dc1 100644
+--- a/libavcodec/mlp_parser.c
++++ b/libavcodec/mlp_parser.c
+@@ -26,8 +26,8 @@
+ 
+ #include <stdint.h>
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/crc.h"
+-#include "libavutil/audioconvert.h"
+ #include "get_bits.h"
+ #include "parser.h"
+ #include "mlp_parser.h"
+diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c
+index b013eeb..7c9103c 100644
+--- a/libavcodec/mpc7.c
++++ b/libavcodec/mpc7.c
+@@ -25,12 +25,12 @@
+  * divided into 32 subbands.
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/lfg.h"
+ #include "avcodec.h"
+ #include "get_bits.h"
+ #include "dsputil.h"
+ #include "mpegaudiodsp.h"
+-#include "libavutil/audioconvert.h"
+ 
+ #include "mpc.h"
+ #include "mpc7data.h"
+diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c
+index 0331789..f43cb4e 100644
+--- a/libavcodec/mpc8.c
++++ b/libavcodec/mpc8.c
+@@ -25,12 +25,12 @@
+  * divided into 32 subbands.
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/lfg.h"
+ #include "avcodec.h"
+ #include "get_bits.h"
+ #include "dsputil.h"
+ #include "mpegaudiodsp.h"
+-#include "libavutil/audioconvert.h"
+ 
+ #include "mpc.h"
+ #include "mpc8data.h"
+diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
+index 52abcb2..bb539cd 100644
+--- a/libavcodec/mpegaudiodec.c
++++ b/libavcodec/mpegaudiodec.c
+@@ -24,7 +24,7 @@
+  * MPEG Audio decoder
+  */
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "avcodec.h"
+ #include "get_bits.h"
+ #include "mathops.h"
+diff --git a/libavcodec/mpegaudioenc.c b/libavcodec/mpegaudioenc.c
+index ab9e0fa..ba0d8cf 100644
+--- a/libavcodec/mpegaudioenc.c
++++ b/libavcodec/mpegaudioenc.c
+@@ -24,7 +24,7 @@
+  * The simplest mpeg audio layer 2 encoder.
+  */
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ 
+ #include "avcodec.h"
+ #include "internal.h"
+diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c
+index f17e9fd..1f79058 100644
+--- a/libavcodec/nellymoserdec.c
++++ b/libavcodec/nellymoserdec.c
+@@ -31,14 +31,14 @@
+  * implementors. The original code is available from http://code.google.com/p/nelly2pcm/
+  */
+ 
+-#include "nellymoser.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/lfg.h"
+ #include "libavutil/random_seed.h"
+-#include "libavutil/audioconvert.h"
+ #include "avcodec.h"
+ #include "dsputil.h"
+ #include "fft.h"
+ #include "fmtconvert.h"
++#include "nellymoser.h"
+ #include "sinewin.h"
+ 
+ #define BITSTREAM_READER_LE
+diff --git a/libavcodec/pcm-mpeg.c b/libavcodec/pcm-mpeg.c
+index b5af649..4f9f525 100644
+--- a/libavcodec/pcm-mpeg.c
++++ b/libavcodec/pcm-mpeg.c
+@@ -24,7 +24,7 @@
+  * PCM codecs for encodings found in MPEG streams (DVD/Blu-ray)
+  */
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "avcodec.h"
+ #include "bytestream.h"
+ 
+diff --git a/libavcodec/qcelpdec.c b/libavcodec/qcelpdec.c
+index 9c2b354..d0f4107 100644
+--- a/libavcodec/qcelpdec.c
++++ b/libavcodec/qcelpdec.c
+@@ -29,7 +29,7 @@
+ 
+ #include <stddef.h>
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "avcodec.h"
+ #include "internal.h"
+ #include "get_bits.h"
+diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
+index a094e6c..1666242 100644
+--- a/libavcodec/qdm2.c
++++ b/libavcodec/qdm2.c
+@@ -36,7 +36,7 @@
+ #include <stdio.h>
+ 
+ #define BITSTREAM_READER_LE
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "avcodec.h"
+ #include "get_bits.h"
+ #include "dsputil.h"
+diff --git a/libavcodec/ra144dec.c b/libavcodec/ra144dec.c
+index cee3892..0c6c7d3 100644
+--- a/libavcodec/ra144dec.c
++++ b/libavcodec/ra144dec.c
+@@ -22,7 +22,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intmath.h"
+ #include "avcodec.h"
+ #include "get_bits.h"
+diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c
+index e080d2b..deaafd2 100644
+--- a/libavcodec/ra288.c
++++ b/libavcodec/ra288.c
+@@ -19,7 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/float_dsp.h"
+ #include "avcodec.h"
+ #define BITSTREAM_READER_LE
+diff --git a/libavcodec/ralf.c b/libavcodec/ralf.c
+index 3244424..c9c8080 100644
+--- a/libavcodec/ralf.c
++++ b/libavcodec/ralf.c
+@@ -26,11 +26,11 @@
+  * Dedicated to the mastermind behind it, Ralph Wiggum.
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "avcodec.h"
+ #include "get_bits.h"
+ #include "golomb.h"
+ #include "unary.h"
+-#include "libavutil/audioconvert.h"
+ #include "ralfdata.h"
+ 
+ #define FILTER_NONE 0
+diff --git a/libavcodec/sipr.c b/libavcodec/sipr.c
+index 9db0923..211396b 100644
+--- a/libavcodec/sipr.c
++++ b/libavcodec/sipr.c
+@@ -25,7 +25,7 @@
+ #include <stdint.h>
+ #include <string.h>
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/mathematics.h"
+ #include "avcodec.h"
+ #define BITSTREAM_READER_LE
+diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
+index df2d4c4..61283e8 100644
+--- a/libavcodec/smacker.c
++++ b/libavcodec/smacker.c
+@@ -31,8 +31,8 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
++#include "libavutil/channel_layout.h"
+ #include "avcodec.h"
+-#include "libavutil/audioconvert.h"
+ #include "mathops.h"
+ 
+ #define BITSTREAM_READER_LE
+diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c
+index efe5f45..7ee1556 100644
+--- a/libavcodec/truespeech.c
++++ b/libavcodec/truespeech.c
+@@ -19,7 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avcodec.h"
+ #include "dsputil.h"
+diff --git a/libavcodec/twinvq.c b/libavcodec/twinvq.c
+index 7af370e..072af7e 100644
+--- a/libavcodec/twinvq.c
++++ b/libavcodec/twinvq.c
+@@ -19,7 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/float_dsp.h"
+ #include "avcodec.h"
+ #include "get_bits.h"
+diff --git a/libavcodec/utils.c b/libavcodec/utils.c
+index 78726ae..8c203b9 100644
+--- a/libavcodec/utils.c
++++ b/libavcodec/utils.c
+@@ -27,10 +27,10 @@
+ 
+ #include "libavutil/avassert.h"
+ #include "libavutil/avstring.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/crc.h"
+ #include "libavutil/mathematics.h"
+ #include "libavutil/pixdesc.h"
+-#include "libavutil/audioconvert.h"
+ #include "libavutil/imgutils.h"
+ #include "libavutil/samplefmt.h"
+ #include "libavutil/dict.h"
+@@ -38,7 +38,6 @@
+ #include "dsputil.h"
+ #include "libavutil/opt.h"
+ #include "thread.h"
+-#include "audioconvert.h"
+ #include "internal.h"
+ #include "bytestream.h"
+ #include <stdlib.h>
+diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
+index 6efc9e7..2fdd27f 100644
+--- a/libavcodec/vmdav.c
++++ b/libavcodec/vmdav.c
+@@ -43,7 +43,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avcodec.h"
+diff --git a/libavcodec/vorbis_data.c b/libavcodec/vorbis_data.c
+index 98c7a59..03c3d6b 100644
+--- a/libavcodec/vorbis_data.c
++++ b/libavcodec/vorbis_data.c
+@@ -18,10 +18,10 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include "libavutil/channel_layout.h"
++#include "libavutil/mem.h"
+ #include "dsputil.h"
+ #include "vorbis.h"
+-#include "libavutil/audioconvert.h"
+-#include "libavutil/mem.h"
+ 
+ const uint8_t ff_vorbis_channel_layout_offsets[8][8] = {
+     { 0 },
+diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
+index eafb40d..a0ce4a3 100644
+--- a/libavcodec/wavpack.c
++++ b/libavcodec/wavpack.c
+@@ -21,7 +21,7 @@
+ 
+ #define BITSTREAM_READER_LE
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "avcodec.h"
+ #include "get_bits.h"
+ #include "unary.h"
+diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c
+index df98167..2ee235c 100644
+--- a/libavcodec/wmavoice.c
++++ b/libavcodec/wmavoice.c
+@@ -29,7 +29,7 @@
+ 
+ #include <math.h>
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/mem.h"
+ #include "dsputil.h"
+ #include "avcodec.h"
+diff --git a/libavcodec/ws-snd1.c b/libavcodec/ws-snd1.c
+index 05cb31c..036316c 100644
+--- a/libavcodec/ws-snd1.c
++++ b/libavcodec/ws-snd1.c
+@@ -21,7 +21,7 @@
+ 
+ #include <stdint.h>
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avcodec.h"
+diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa-audio-common.c
+index b48e007..21f1594 100644
+--- a/libavdevice/alsa-audio-common.c
++++ b/libavdevice/alsa-audio-common.c
+@@ -31,7 +31,7 @@
+ #include <alsa/asoundlib.h>
+ #include "libavformat/avformat.h"
+ #include "libavutil/avassert.h"
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ 
+ #include "alsa-audio.h"
+ 
+diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c
+index 77c16be..2059cf2 100644
+--- a/libavfilter/af_aformat.c
++++ b/libavfilter/af_aformat.c
+@@ -23,8 +23,8 @@
+  * format audio filter
+  */
+ 
+-#include "libavutil/audioconvert.h"
+ #include "libavutil/avstring.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ #include "libavutil/opt.h"
+ 
+diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c
+index dde9595..7ef94b9 100644
+--- a/libavfilter/af_amix.c
++++ b/libavfilter/af_amix.c
+@@ -28,10 +28,10 @@
+  * output.
+  */
+ 
+-#include "libavutil/audioconvert.h"
+ #include "libavutil/audio_fifo.h"
+ #include "libavutil/avassert.h"
+ #include "libavutil/avstring.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ #include "libavutil/float_dsp.h"
+ #include "libavutil/mathematics.h"
+diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c
+index 00e0322..bcf821a 100644
+--- a/libavfilter/af_ashowinfo.c
++++ b/libavfilter/af_ashowinfo.c
+@@ -27,7 +27,7 @@
+ #include <stddef.h>
+ 
+ #include "libavutil/adler32.h"
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ #include "libavutil/mem.h"
+ #include "libavutil/samplefmt.h"
+diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c
+index f70b481..4f9ee86 100644
+--- a/libavfilter/af_channelmap.c
++++ b/libavfilter/af_channelmap.c
+@@ -25,8 +25,8 @@
+ 
+ #include <ctype.h>
+ 
+-#include "libavutil/audioconvert.h"
+ #include "libavutil/avstring.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ #include "libavutil/mathematics.h"
+ #include "libavutil/opt.h"
+diff --git a/libavfilter/af_channelsplit.c b/libavfilter/af_channelsplit.c
+index 92fb27e..e8ceb9c 100644
+--- a/libavfilter/af_channelsplit.c
++++ b/libavfilter/af_channelsplit.c
+@@ -23,7 +23,7 @@
+  * Split an audio stream into per-channel streams.
+  */
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/internal.h"
+ #include "libavutil/opt.h"
+ 
+diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
+index 7e3a542..c810e59 100644
+--- a/libavfilter/af_join.c
++++ b/libavfilter/af_join.c
+@@ -25,8 +25,8 @@
+  * a single output
+  */
+ 
+-#include "libavutil/audioconvert.h"
+ #include "libavutil/avassert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ #include "libavutil/opt.h"
+ 
+diff --git a/libavfilter/asrc_anullsrc.c b/libavfilter/asrc_anullsrc.c
+index 7096cea..4cbaa81 100644
+--- a/libavfilter/asrc_anullsrc.c
++++ b/libavfilter/asrc_anullsrc.c
+@@ -24,10 +24,10 @@
+ #include <inttypes.h>
+ #include <stdio.h>
+ 
++#include "libavutil/channel_layout.h"
++#include "libavutil/internal.h"
+ #include "avfilter.h"
+ #include "internal.h"
+-#include "libavutil/audioconvert.h"
+-#include "libavutil/internal.h"
+ 
+ typedef struct {
+     uint64_t channel_layout;
+diff --git a/libavfilter/audio.c b/libavfilter/audio.c
+index 66010c1..48e038b 100644
+--- a/libavfilter/audio.c
++++ b/libavfilter/audio.c
+@@ -16,7 +16,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ 
+ #include "audio.h"
+diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
+index 1e3b001..c7db857 100644
+--- a/libavfilter/avfilter.c
++++ b/libavfilter/avfilter.c
+@@ -21,10 +21,10 @@
+ 
+ /* #define DEBUG */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ #include "libavutil/pixdesc.h"
+ #include "libavutil/rational.h"
+-#include "libavutil/audioconvert.h"
+ 
+ #include "avfilter.h"
+ #include "formats.h"
+diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
+index adb8b79..01d39b6 100644
+--- a/libavfilter/avfilter.h
++++ b/libavfilter/avfilter.h
+@@ -478,7 +478,7 @@ struct AVFilterLink {
+     int h;                      ///< agreed upon image height
+     AVRational sample_aspect_ratio; ///< agreed upon sample aspect ratio
+     /* These two parameters apply only to audio */
+-    uint64_t channel_layout;    ///< channel layout of current buffer (see libavutil/audioconvert.h)
++    uint64_t channel_layout;    ///< channel layout of current buffer (see libavutil/channel_layout.h)
+     int sample_rate;            ///< samples per second
+ 
+     int format;                 ///< agreed upon media format
+diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
+index 4a66c78..f5c9984 100644
+--- a/libavfilter/avfiltergraph.c
++++ b/libavfilter/avfiltergraph.c
+@@ -23,16 +23,15 @@
+ #include <ctype.h>
+ #include <string.h>
+ 
++#include "libavutil/avassert.h"
++#include "libavutil/channel_layout.h"
++#include "libavutil/common.h"
++#include "libavutil/log.h"
+ #include "avfilter.h"
+ #include "avfiltergraph.h"
+ #include "formats.h"
+ #include "internal.h"
+ 
+-#include "libavutil/audioconvert.h"
+-#include "libavutil/avassert.h"
+-#include "libavutil/common.h"
+-#include "libavutil/log.h"
+-
+ static const AVClass filtergraph_class = {
+     .class_name = "AVFilterGraph",
+     .item_name  = av_default_item_name,
+diff --git a/libavfilter/buffer.c b/libavfilter/buffer.c
+index 439425a..8eb3ce3 100644
+--- a/libavfilter/buffer.c
++++ b/libavfilter/buffer.c
+@@ -16,7 +16,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ #include "libavcodec/avcodec.h"
+ 
+diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
+index c68b909..96f5351 100644
+--- a/libavfilter/buffersink.c
++++ b/libavfilter/buffersink.c
+@@ -24,8 +24,8 @@
+  */
+ 
+ #include "libavutil/audio_fifo.h"
+-#include "libavutil/audioconvert.h"
+ #include "libavutil/avassert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ #include "libavutil/mathematics.h"
+ 
+diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c
+index a2d5edb..9354691 100644
+--- a/libavfilter/buffersrc.c
++++ b/libavfilter/buffersrc.c
+@@ -23,6 +23,12 @@
+  * memory buffer source filter
+  */
+ 
++#include "libavutil/channel_layout.h"
++#include "libavutil/common.h"
++#include "libavutil/fifo.h"
++#include "libavutil/imgutils.h"
++#include "libavutil/opt.h"
++#include "libavutil/samplefmt.h"
+ #include "audio.h"
+ #include "avfilter.h"
+ #include "buffersrc.h"
+@@ -30,13 +36,6 @@
+ #include "internal.h"
+ #include "video.h"
+ 
+-#include "libavutil/audioconvert.h"
+-#include "libavutil/common.h"
+-#include "libavutil/fifo.h"
+-#include "libavutil/imgutils.h"
+-#include "libavutil/opt.h"
+-#include "libavutil/samplefmt.h"
+-
+ typedef struct {
+     const AVClass    *class;
+     AVFifoBuffer     *fifo;
+diff --git a/libavfilter/fifo.c b/libavfilter/fifo.c
+index b13be68..1bfacaf 100644
+--- a/libavfilter/fifo.c
++++ b/libavfilter/fifo.c
+@@ -24,7 +24,7 @@
+  */
+ 
+ #include "libavutil/avassert.h"
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ #include "libavutil/mathematics.h"
+ #include "libavutil/samplefmt.h"
+diff --git a/libavformat/aea.c b/libavformat/aea.c
+index 4b6bf32..7675009 100644
+--- a/libavformat/aea.c
++++ b/libavformat/aea.c
+@@ -20,10 +20,10 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include "libavutil/channel_layout.h"
++#include "libavutil/intreadwrite.h"
+ #include "avformat.h"
+ #include "pcm.h"
+-#include "libavutil/intreadwrite.h"
+-#include "libavutil/audioconvert.h"
+ 
+ #define AT1_SU_SIZE     212
+ 
+diff --git a/libavformat/flic.c b/libavformat/flic.c
+index 6019763..2eb6f05 100644
+--- a/libavformat/flic.c
++++ b/libavformat/flic.c
+@@ -31,8 +31,8 @@
+  * special FLIs from the PC games "Magic Carpet" and "X-COM: Terror from the Deep".
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+-#include "libavutil/audioconvert.h"
+ #include "avformat.h"
+ #include "internal.h"
+ 
+diff --git a/libavformat/g723_1.c b/libavformat/g723_1.c
+index 2674ce5..0b92702 100644
+--- a/libavformat/g723_1.c
++++ b/libavformat/g723_1.c
+@@ -24,7 +24,7 @@
+  * G.723.1 demuxer
+  */
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "avformat.h"
+ #include "internal.h"
+ 
+diff --git a/libavformat/mov.c b/libavformat/mov.c
+index 63049f5..35c07bd 100644
+--- a/libavformat/mov.c
++++ b/libavformat/mov.c
+@@ -26,7 +26,7 @@
+ //#define MOV_EXPORT_ALL_METADATA
+ 
+ #include "libavutil/attributes.h"
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "libavutil/intfloat.h"
+ #include "libavutil/mathematics.h"
+diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c
+index 00a2a4b..aa7ba10 100644
+--- a/libavformat/mov_chan.c
++++ b/libavformat/mov_chan.c
+@@ -25,7 +25,7 @@
+ 
+ #include <stdint.h>
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavcodec/avcodec.h"
+ #include "mov_chan.h"
+ 
+diff --git a/libavformat/wv.c b/libavformat/wv.c
+index a2ae5a4..f6b96d5 100644
+--- a/libavformat/wv.c
++++ b/libavformat/wv.c
+@@ -19,7 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+-#include "libavutil/audioconvert.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "libavutil/dict.h"
+ #include "avformat.h"
+diff --git a/libavresample/avresample.h b/libavresample/avresample.h
+index b0a9e24..affeeeb 100644
+--- a/libavresample/avresample.h
++++ b/libavresample/avresample.h
+@@ -93,8 +93,8 @@
+  *  avresample_free().
+  */
+ 
+-#include "libavutil/audioconvert.h"
+ #include "libavutil/avutil.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/dict.h"
+ #include "libavutil/log.h"
+ 
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0207-doc-git-howto-Leave-reviewers-time-to-react-before-p.patch b/debian/patches/post-9beta2/0207-doc-git-howto-Leave-reviewers-time-to-react-before-p.patch
new file mode 100644
index 0000000..7c9faad
--- /dev/null
+++ b/debian/patches/post-9beta2/0207-doc-git-howto-Leave-reviewers-time-to-react-before-p.patch
@@ -0,0 +1,31 @@
+From 97bf7c03b1338a867da52c159a2afecbdedcfa88 Mon Sep 17 00:00:00 2001
+From: Diego Biurrun <diego at biurrun.de>
+Date: Thu, 25 Oct 2012 18:33:38 +0200
+Subject: [PATCH 207/278] doc: git-howto: Leave reviewers time to react before
+ pushing patches
+
+---
+ doc/git-howto.texi |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/doc/git-howto.texi b/doc/git-howto.texi
+index 68e0061..5a8e2a3 100644
+--- a/doc/git-howto.texi
++++ b/doc/git-howto.texi
+@@ -419,6 +419,13 @@ Also note that every single commit should pass the test suite, not just
+ the result of a series of patches. So if you have a series of commits
+ to push, run the test suite on every single commit.
+ 
++Give other developers a reasonable amount of time to look at and review
++patches before you push them. Not everybody is online 24/7, but may wish
++to look at and comment on a patch nonetheless. The time you leave depends
++on the urgency and complexity of the patch. Use your common sense to pick
++a timeframe that allows everybody that you think may wish to comment
++and/or should comment on the change an opportunity to see it.
++
+ Finally, after pushing, mark all patches as committed on
+ @url{http://patches.libav.org/,patchwork}.
+ Sometimes this is not automatically done when a patch has been
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0208-x86-Require-an-assembler-able-to-cope-with-AVX-instr.patch b/debian/patches/post-9beta2/0208-x86-Require-an-assembler-able-to-cope-with-AVX-instr.patch
new file mode 100644
index 0000000..b328d1c
--- /dev/null
+++ b/debian/patches/post-9beta2/0208-x86-Require-an-assembler-able-to-cope-with-AVX-instr.patch
@@ -0,0 +1,33 @@
+From b8e8a07c6c4df93de92480f5c3a14296a6a2a690 Mon Sep 17 00:00:00 2001
+From: Diego Biurrun <diego at biurrun.de>
+Date: Fri, 28 Sep 2012 19:36:53 +0200
+Subject: [PATCH 208/278] x86: Require an assembler able to cope with AVX
+ instructions
+
+All modern assemblers have this capability.  Older NASM versions
+that lack the capability produce code that crashes at runtime,
+so it's better to error out during the build process instead.
+
+CC: libav-stable at libav.org
+---
+ configure |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index d67fc85..a66a7ff 100755
+--- a/configure
++++ b/configure
+@@ -3152,9 +3152,8 @@ EOF
+             elf*) enabled debug && append YASMFLAGS $yasm_debug ;;
+         esac
+ 
+-        check_yasm "pextrd [eax], xmm0, 1" && enable yasm ||
++        check_yasm "vextractf128 xmm0, ymm0, 0" && enable yasm ||
+             die "yasm not found, use --disable-yasm for a crippled build"
+-        check_yasm "vextractf128 xmm0, ymm0, 0"      || disable avx_external
+         check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external
+         check_yasm "CPU amdnop" && enable cpunop
+     fi
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0209-build-Drop-AVX-assembly-ifdefs.patch b/debian/patches/post-9beta2/0209-build-Drop-AVX-assembly-ifdefs.patch
new file mode 100644
index 0000000..9b5ecef
--- /dev/null
+++ b/debian/patches/post-9beta2/0209-build-Drop-AVX-assembly-ifdefs.patch
@@ -0,0 +1,661 @@
+From 2b479bcab0a8365a7c094c5fa44b8cb6da9810d0 Mon Sep 17 00:00:00 2001
+From: Diego Biurrun <diego at biurrun.de>
+Date: Fri, 19 Oct 2012 19:04:40 +0200
+Subject: [PATCH 209/278] build: Drop AVX assembly ifdefs
+
+An assembler able to cope with AVX instructions is now required.
+---
+ libavcodec/x86/dct32.asm                |    2 --
+ libavcodec/x86/dsputil.asm              |    6 ------
+ libavcodec/x86/fft.asm                  |    9 --------
+ libavcodec/x86/h264_chromamc_10bit.asm  |    4 ----
+ libavcodec/x86/h264_idct_10bit.asm      |   16 ---------------
+ libavcodec/x86/h264_intrapred_10bit.asm |   26 -----------------------
+ libavresample/x86/audio_convert.asm     |   34 -------------------------------
+ libavresample/x86/audio_mix.asm         |    8 --------
+ libavutil/x86/float_dsp.asm             |    4 ----
+ 9 files changed, 109 deletions(-)
+
+diff --git a/libavcodec/x86/dct32.asm b/libavcodec/x86/dct32.asm
+index 25bc8f7..9c147b9 100644
+--- a/libavcodec/x86/dct32.asm
++++ b/libavcodec/x86/dct32.asm
+@@ -192,7 +192,6 @@ ps_p1p1m1m1: dd 0, 0, 0x80000000, 0x80000000, 0, 0, 0x80000000, 0x80000000
+ 
+ INIT_YMM avx
+ SECTION_TEXT
+-%if HAVE_AVX_EXTERNAL
+ ; void ff_dct32_float_avx(FFTSample *out, const FFTSample *in)
+ cglobal dct32_float, 2,3,8, out, in, tmp
+     ; pass 1
+@@ -265,7 +264,6 @@ cglobal dct32_float, 2,3,8, out, in, tmp
+ INIT_XMM
+     PASS6_AND_PERMUTE
+     RET
+-%endif
+ 
+ %if ARCH_X86_64
+ %define SPILL SWAP
+diff --git a/libavcodec/x86/dsputil.asm b/libavcodec/x86/dsputil.asm
+index 0ed64aa..c9118a1 100644
+--- a/libavcodec/x86/dsputil.asm
++++ b/libavcodec/x86/dsputil.asm
+@@ -1168,10 +1168,8 @@ ALIGN 16
+ 
+ INIT_XMM sse
+ VECTOR_FMUL_REVERSE
+-%if HAVE_AVX_EXTERNAL
+ INIT_YMM avx
+ VECTOR_FMUL_REVERSE
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ; vector_fmul_add(float *dst, const float *src0, const float *src1,
+@@ -1198,10 +1196,8 @@ ALIGN 16
+ 
+ INIT_XMM sse
+ VECTOR_FMUL_ADD
+-%if HAVE_AVX_EXTERNAL
+ INIT_YMM avx
+ VECTOR_FMUL_ADD
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ; void ff_butterflies_float_interleave(float *dst, const float *src0,
+@@ -1244,10 +1240,8 @@ cglobal butterflies_float_interleave, 4,4,3, dst, src0, src1, len
+ 
+ INIT_XMM sse
+ BUTTERFLIES_FLOAT_INTERLEAVE
+-%if HAVE_AVX_EXTERNAL
+ INIT_YMM avx
+ BUTTERFLIES_FLOAT_INTERLEAVE
+-%endif
+ 
+ INIT_XMM sse2
+ ; %1 = aligned/unaligned
+diff --git a/libavcodec/x86/fft.asm b/libavcodec/x86/fft.asm
+index 111f322..c87752b 100644
+--- a/libavcodec/x86/fft.asm
++++ b/libavcodec/x86/fft.asm
+@@ -305,7 +305,6 @@ IF%1 mova  Z(1), m5
+ 
+ INIT_YMM avx
+ 
+-%if HAVE_AVX_EXTERNAL
+ align 16
+ fft8_avx:
+     mova      m0, Z(0)
+@@ -394,7 +393,6 @@ fft32_interleave_avx:
+     sub r2d, mmsize/4
+     jg .deint_loop
+     ret
+-%endif
+ 
+ INIT_XMM sse
+ 
+@@ -539,7 +537,6 @@ DEFINE_ARGS zc, w, n, o1, o3
+ 
+ INIT_YMM avx
+ 
+-%if HAVE_AVX_EXTERNAL
+ %macro INTERL_AVX 5
+     vunpckhps      %3, %2, %1
+     vunpcklps      %2, %2, %1
+@@ -561,7 +558,6 @@ cglobal fft_calc, 2,5,8
+     FFT_DISPATCH _interleave %+ SUFFIX, r1
+     REP_RET
+ 
+-%endif
+ 
+ INIT_XMM sse
+ 
+@@ -780,11 +776,9 @@ align 8
+ dispatch_tab %+ fullsuffix: pointer list_of_fft
+ %endmacro ; DECL_FFT
+ 
+-%if HAVE_AVX_EXTERNAL
+ INIT_YMM avx
+ DECL_FFT 6
+ DECL_FFT 6, _interleave
+-%endif
+ INIT_XMM sse
+ DECL_FFT 5
+ DECL_FFT 5, _interleave
+@@ -1086,7 +1080,4 @@ DECL_IMDCT POSROTATESHUF_3DNOW
+ %endif
+ 
+ INIT_YMM avx
+-
+-%if HAVE_AVX_EXTERNAL
+ DECL_IMDCT POSROTATESHUF_AVX
+-%endif
+diff --git a/libavcodec/x86/h264_chromamc_10bit.asm b/libavcodec/x86/h264_chromamc_10bit.asm
+index d24308d..2619737 100644
+--- a/libavcodec/x86/h264_chromamc_10bit.asm
++++ b/libavcodec/x86/h264_chromamc_10bit.asm
+@@ -251,10 +251,8 @@ cglobal %1_h264_chroma_mc2_10, 6,7
+ %define CHROMAMC_AVG  NOTHING
+ INIT_XMM sse2
+ CHROMA_MC8 put
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ CHROMA_MC8 put
+-%endif
+ INIT_MMX mmx2
+ CHROMA_MC4 put
+ CHROMA_MC2 put
+@@ -262,10 +260,8 @@ CHROMA_MC2 put
+ %define CHROMAMC_AVG  AVG
+ INIT_XMM sse2
+ CHROMA_MC8 avg
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ CHROMA_MC8 avg
+-%endif
+ INIT_MMX mmx2
+ CHROMA_MC4 avg
+ CHROMA_MC2 avg
+diff --git a/libavcodec/x86/h264_idct_10bit.asm b/libavcodec/x86/h264_idct_10bit.asm
+index 5ba241b..b3b7df9 100644
+--- a/libavcodec/x86/h264_idct_10bit.asm
++++ b/libavcodec/x86/h264_idct_10bit.asm
+@@ -79,10 +79,8 @@ cglobal h264_idct_add_10, 3,3
+ 
+ INIT_XMM sse2
+ IDCT_ADD_10
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ IDCT_ADD_10
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ; h264_idct_add16(pixel *dst, const int *block_offset, dctcoef *block, int stride, const uint8_t nnzc[6*8])
+@@ -109,11 +107,9 @@ add4x4_idct %+ SUFFIX:
+ INIT_XMM sse2
+ ALIGN 16
+ ADD4x4IDCT
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ ALIGN 16
+ ADD4x4IDCT
+-%endif
+ 
+ %macro ADD16_OP 2
+     cmp          byte [r4+%2], 0
+@@ -149,10 +145,8 @@ cglobal h264_idct_add16_10, 5,6
+ 
+ INIT_XMM sse2
+ IDCT_ADD16_10
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ IDCT_ADD16_10
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ; void h264_idct_dc_add(pixel *dst, dctcoef *block, int stride)
+@@ -215,10 +209,8 @@ cglobal h264_idct8_dc_add_10,3,3,7
+ 
+ INIT_XMM sse2
+ IDCT8_DC_ADD
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ IDCT8_DC_ADD
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ; h264_idct_add16intra(pixel *dst, const int *block_offset, dctcoef *block, int stride, const uint8_t nnzc[6*8])
+@@ -286,10 +278,8 @@ cglobal h264_idct_add16intra_10,5,7,8
+ 
+ INIT_XMM sse2
+ IDCT_ADD16INTRA_10
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ IDCT_ADD16INTRA_10
+-%endif
+ 
+ %assign last_block 36
+ ;-----------------------------------------------------------------------------
+@@ -323,10 +313,8 @@ cglobal h264_idct_add8_10,5,8,7
+ 
+ INIT_XMM sse2
+ IDCT_ADD8
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ IDCT_ADD8
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ; void h264_idct8_add(pixel *dst, dctcoef *block, int stride)
+@@ -500,10 +488,8 @@ h264_idct8_add1_10 %+ SUFFIX:
+ 
+ INIT_XMM sse2
+ IDCT8_ADD
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ IDCT8_ADD
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ; h264_idct8_add4(pixel **dst, const int *block_offset, dctcoef *block, int stride, const uint8_t nnzc[6*8])
+@@ -540,7 +526,5 @@ cglobal h264_idct8_add4_10, 0,7,16
+ 
+ INIT_XMM sse2
+ IDCT8_ADD4
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ IDCT8_ADD4
+-%endif
+diff --git a/libavcodec/x86/h264_intrapred_10bit.asm b/libavcodec/x86/h264_intrapred_10bit.asm
+index 039af6d..eae45ae 100644
+--- a/libavcodec/x86/h264_intrapred_10bit.asm
++++ b/libavcodec/x86/h264_intrapred_10bit.asm
+@@ -82,10 +82,8 @@ INIT_XMM sse2
+ PRED4x4_DR
+ INIT_XMM ssse3
+ PRED4x4_DR
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ PRED4x4_DR
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ; void pred4x4_vertical_right(pixel *src, const pixel *topright, int stride)
+@@ -121,10 +119,8 @@ INIT_XMM sse2
+ PRED4x4_VR
+ INIT_XMM ssse3
+ PRED4x4_VR
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ PRED4x4_VR
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ; void pred4x4_horizontal_down(pixel *src, const pixel *topright, int stride)
+@@ -163,10 +159,8 @@ INIT_XMM sse2
+ PRED4x4_HD
+ INIT_XMM ssse3
+ PRED4x4_HD
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ PRED4x4_HD
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ; void pred4x4_dc(pixel *src, const pixel *topright, int stride)
+@@ -234,10 +228,8 @@ cglobal pred4x4_down_left_10, 3, 3
+ 
+ INIT_XMM sse2
+ PRED4x4_DL
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ PRED4x4_DL
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ; void pred4x4_vertical_left(pixel *src, const pixel *topright, int stride)
+@@ -263,10 +255,8 @@ cglobal pred4x4_vertical_left_10, 3, 3
+ 
+ INIT_XMM sse2
+ PRED4x4_VL
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ PRED4x4_VL
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ; void pred4x4_horizontal_up(pixel *src, const pixel *topright, int stride)
+@@ -573,10 +563,8 @@ cglobal pred8x8l_top_dc_10, 4, 4, 6
+ 
+ INIT_XMM sse2
+ PRED8x8L_TOP_DC
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ PRED8x8L_TOP_DC
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ;void pred8x8l_dc(pixel *src, int has_topleft, int has_topright, int stride)
+@@ -632,10 +620,8 @@ cglobal pred8x8l_dc_10, 4, 6, 6
+ 
+ INIT_XMM sse2
+ PRED8x8L_DC
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ PRED8x8L_DC
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ; void pred8x8l_vertical(pixel *src, int has_topleft, int has_topright, int stride)
+@@ -667,10 +653,8 @@ cglobal pred8x8l_vertical_10, 4, 4, 6
+ 
+ INIT_XMM sse2
+ PRED8x8L_VERTICAL
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ PRED8x8L_VERTICAL
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ; void pred8x8l_horizontal(uint8_t *src, int has_topleft, int has_topright, int stride)
+@@ -723,10 +707,8 @@ INIT_XMM sse2
+ PRED8x8L_HORIZONTAL
+ INIT_XMM ssse3
+ PRED8x8L_HORIZONTAL
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ PRED8x8L_HORIZONTAL
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ;void pred8x8l_down_left(pixel *src, int has_topleft, int has_topright, int stride)
+@@ -791,10 +773,8 @@ INIT_XMM sse2
+ PRED8x8L_DOWN_LEFT
+ INIT_XMM ssse3
+ PRED8x8L_DOWN_LEFT
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ PRED8x8L_DOWN_LEFT
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ;void pred8x8l_down_right(pixel *src, int has_topleft, int has_topright, int stride)
+@@ -865,10 +845,8 @@ INIT_XMM sse2
+ PRED8x8L_DOWN_RIGHT
+ INIT_XMM ssse3
+ PRED8x8L_DOWN_RIGHT
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ PRED8x8L_DOWN_RIGHT
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ; void pred8x8l_vertical_right(pixel *src, int has_topleft, int has_topright, int stride)
+@@ -935,10 +913,8 @@ INIT_XMM sse2
+ PRED8x8L_VERTICAL_RIGHT
+ INIT_XMM ssse3
+ PRED8x8L_VERTICAL_RIGHT
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ PRED8x8L_VERTICAL_RIGHT
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ; void pred8x8l_horizontal_up(pixel *src, int has_topleft, int has_topright, int stride)
+@@ -996,10 +972,8 @@ INIT_XMM sse2
+ PRED8x8L_HORIZONTAL_UP
+ INIT_XMM ssse3
+ PRED8x8L_HORIZONTAL_UP
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ PRED8x8L_HORIZONTAL_UP
+-%endif
+ 
+ 
+ ;-----------------------------------------------------------------------------
+diff --git a/libavresample/x86/audio_convert.asm b/libavresample/x86/audio_convert.asm
+index 1d125c2..1af1429 100644
+--- a/libavresample/x86/audio_convert.asm
++++ b/libavresample/x86/audio_convert.asm
+@@ -155,10 +155,8 @@ cglobal conv_s32_to_flt, 3,3,3, dst, src, len
+ 
+ INIT_XMM sse2
+ CONV_S32_TO_FLT
+-%if HAVE_AVX_EXTERNAL
+ INIT_YMM avx
+ CONV_S32_TO_FLT
+-%endif
+ 
+ ;------------------------------------------------------------------------------
+ ; void ff_conv_flt_to_s16(int16_t *dst, const float *src, int len);
+@@ -228,10 +226,8 @@ cglobal conv_flt_to_s32, 3,3,6, dst, src, len
+ 
+ INIT_XMM sse2
+ CONV_FLT_TO_S32
+-%if HAVE_AVX_EXTERNAL
+ INIT_YMM avx
+ CONV_FLT_TO_S32
+-%endif
+ 
+ ;------------------------------------------------------------------------------
+ ; void ff_conv_s16p_to_s16_2ch(int16_t *dst, int16_t *const *src, int len,
+@@ -265,10 +261,8 @@ cglobal conv_s16p_to_s16_2ch, 3,4,5, dst, src0, len, src1
+ 
+ INIT_XMM sse2
+ CONV_S16P_TO_S16_2CH
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ CONV_S16P_TO_S16_2CH
+-%endif
+ 
+ ;------------------------------------------------------------------------------
+ ; void ff_conv_s16p_to_s16_6ch(int16_t *dst, int16_t *const *src, int len,
+@@ -388,10 +382,8 @@ INIT_XMM sse2
+ CONV_S16P_TO_S16_6CH
+ INIT_XMM sse2slow
+ CONV_S16P_TO_S16_6CH
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ CONV_S16P_TO_S16_6CH
+-%endif
+ 
+ ;------------------------------------------------------------------------------
+ ; void ff_conv_s16p_to_flt_2ch(float *dst, int16_t *const *src, int len,
+@@ -437,10 +429,8 @@ cglobal conv_s16p_to_flt_2ch, 3,4,6, dst, src0, len, src1
+ 
+ INIT_XMM sse2
+ CONV_S16P_TO_FLT_2CH
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ CONV_S16P_TO_FLT_2CH
+-%endif
+ 
+ ;------------------------------------------------------------------------------
+ ; void ff_conv_s16p_to_flt_6ch(float *dst, int16_t *const *src, int len,
+@@ -541,10 +531,8 @@ INIT_XMM sse2
+ CONV_S16P_TO_FLT_6CH
+ INIT_XMM ssse3
+ CONV_S16P_TO_FLT_6CH
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ CONV_S16P_TO_FLT_6CH
+-%endif
+ 
+ ;------------------------------------------------------------------------------
+ ; void ff_conv_fltp_to_s16_2ch(int16_t *dst, float *const *src, int len,
+@@ -697,10 +685,8 @@ INIT_MMX sse
+ CONV_FLTP_TO_S16_6CH
+ INIT_XMM sse2
+ CONV_FLTP_TO_S16_6CH
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ CONV_FLTP_TO_S16_6CH
+-%endif
+ 
+ ;------------------------------------------------------------------------------
+ ; void ff_conv_fltp_to_flt_2ch(float *dst, float *const *src, int len,
+@@ -734,10 +720,8 @@ cglobal conv_fltp_to_flt_2ch, 3,4,5, dst, src0, len, src1
+ 
+ INIT_XMM sse
+ CONV_FLTP_TO_FLT_2CH
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ CONV_FLTP_TO_FLT_2CH
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ; void ff_conv_fltp_to_flt_6ch(float *dst, float *const *src, int len,
+@@ -815,10 +799,8 @@ INIT_MMX mmx
+ CONV_FLTP_TO_FLT_6CH
+ INIT_XMM sse4
+ CONV_FLTP_TO_FLT_6CH
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ CONV_FLTP_TO_FLT_6CH
+-%endif
+ 
+ ;------------------------------------------------------------------------------
+ ; void ff_conv_s16_to_s16p_2ch(int16_t *const *dst, int16_t *src, int len,
+@@ -864,10 +846,8 @@ INIT_XMM sse2
+ CONV_S16_TO_S16P_2CH
+ INIT_XMM ssse3
+ CONV_S16_TO_S16P_2CH
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ CONV_S16_TO_S16P_2CH
+-%endif
+ 
+ ;------------------------------------------------------------------------------
+ ; void ff_conv_s16_to_s16p_6ch(int16_t *const *dst, int16_t *src, int len,
+@@ -923,10 +903,8 @@ INIT_XMM sse2
+ CONV_S16_TO_S16P_6CH
+ INIT_XMM ssse3
+ CONV_S16_TO_S16P_6CH
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ CONV_S16_TO_S16P_6CH
+-%endif
+ 
+ ;------------------------------------------------------------------------------
+ ; void ff_conv_s16_to_fltp_2ch(float *const *dst, int16_t *src, int len,
+@@ -961,10 +939,8 @@ cglobal conv_s16_to_fltp_2ch, 3,4,5, dst0, src, len, dst1
+ 
+ INIT_XMM sse2
+ CONV_S16_TO_FLTP_2CH
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ CONV_S16_TO_FLTP_2CH
+-%endif
+ 
+ ;------------------------------------------------------------------------------
+ ; void ff_conv_s16_to_fltp_6ch(float *const *dst, int16_t *src, int len,
+@@ -1042,10 +1018,8 @@ INIT_XMM ssse3
+ CONV_S16_TO_FLTP_6CH
+ INIT_XMM sse4
+ CONV_S16_TO_FLTP_6CH
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ CONV_S16_TO_FLTP_6CH
+-%endif
+ 
+ ;------------------------------------------------------------------------------
+ ; void ff_conv_flt_to_s16p_2ch(int16_t *const *dst, float *src, int len,
+@@ -1088,10 +1062,8 @@ cglobal conv_flt_to_s16p_2ch, 3,4,6, dst0, src, len, dst1
+ 
+ INIT_XMM sse2
+ CONV_FLT_TO_S16P_2CH
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ CONV_FLT_TO_S16P_2CH
+-%endif
+ 
+ ;------------------------------------------------------------------------------
+ ; void ff_conv_flt_to_s16p_6ch(int16_t *const *dst, float *src, int len,
+@@ -1160,10 +1132,8 @@ INIT_XMM sse2
+ CONV_FLT_TO_S16P_6CH
+ INIT_XMM ssse3
+ CONV_FLT_TO_S16P_6CH
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ CONV_FLT_TO_S16P_6CH
+-%endif
+ 
+ ;------------------------------------------------------------------------------
+ ; void ff_conv_flt_to_fltp_2ch(float *const *dst, float *src, int len,
+@@ -1192,10 +1162,8 @@ cglobal conv_flt_to_fltp_2ch, 3,4,3, dst0, src, len, dst1
+ 
+ INIT_XMM sse
+ CONV_FLT_TO_FLTP_2CH
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ CONV_FLT_TO_FLTP_2CH
+-%endif
+ 
+ ;------------------------------------------------------------------------------
+ ; void ff_conv_flt_to_fltp_6ch(float *const *dst, float *src, int len,
+@@ -1255,7 +1223,5 @@ cglobal conv_flt_to_fltp_6ch, 2,7,7, dst, src, dst1, dst2, dst3, dst4, dst5
+ 
+ INIT_XMM sse2
+ CONV_FLT_TO_FLTP_6CH
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ CONV_FLT_TO_FLTP_6CH
+-%endif
+diff --git a/libavresample/x86/audio_mix.asm b/libavresample/x86/audio_mix.asm
+index 7f3b5b9..47c23e4 100644
+--- a/libavresample/x86/audio_mix.asm
++++ b/libavresample/x86/audio_mix.asm
+@@ -55,10 +55,8 @@ cglobal mix_2_to_1_fltp_flt, 3,4,6, src, matrix, len, src1
+ 
+ INIT_XMM sse
+ MIX_2_TO_1_FLTP_FLT
+-%if HAVE_AVX_EXTERNAL
+ INIT_YMM avx
+ MIX_2_TO_1_FLTP_FLT
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ; void ff_mix_2_to_1_s16p_flt(int16_t **src, float **matrix, int len,
+@@ -174,10 +172,8 @@ cglobal mix_1_to_2_fltp_flt, 3,5,4, src0, matrix0, len, src1, matrix1
+ 
+ INIT_XMM sse
+ MIX_1_TO_2_FLTP_FLT
+-%if HAVE_AVX_EXTERNAL
+ INIT_YMM avx
+ MIX_1_TO_2_FLTP_FLT
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ; void ff_mix_1_to_2_s16p_flt(int16_t **src, float **matrix, int len,
+@@ -221,10 +217,8 @@ INIT_XMM sse2
+ MIX_1_TO_2_S16P_FLT
+ INIT_XMM sse4
+ MIX_1_TO_2_S16P_FLT
+-%if HAVE_AVX_EXTERNAL
+ INIT_XMM avx
+ MIX_1_TO_2_S16P_FLT
+-%endif
+ 
+ ;-----------------------------------------------------------------------------
+ ; void ff_mix_3_8_to_1_2_fltp/s16p_flt(float/int16_t **src, float **matrix,
+@@ -489,7 +483,6 @@ cglobal mix_%1_to_%2_%3_flt, 3,in_channels+2,needed_mmregs+matrix_elements_mm, s
+     MIX_3_8_TO_1_2_FLT %%i, 1, s16p
+     MIX_3_8_TO_1_2_FLT %%i, 2, s16p
+     ; do not use ymm AVX or FMA4 in x86-32 for 6 or more channels due to stack alignment issues
+-    %if HAVE_AVX_EXTERNAL
+     %if ARCH_X86_64 || %%i < 6
+     INIT_YMM avx
+     %else
+@@ -500,7 +493,6 @@ cglobal mix_%1_to_%2_%3_flt, 3,in_channels+2,needed_mmregs+matrix_elements_mm, s
+     INIT_XMM avx
+     MIX_3_8_TO_1_2_FLT %%i, 1, s16p
+     MIX_3_8_TO_1_2_FLT %%i, 2, s16p
+-    %endif
+     %if HAVE_FMA4_EXTERNAL
+     %if ARCH_X86_64 || %%i < 6
+     INIT_YMM fma4
+diff --git a/libavutil/x86/float_dsp.asm b/libavutil/x86/float_dsp.asm
+index bbc9a8b..a8857b9 100644
+--- a/libavutil/x86/float_dsp.asm
++++ b/libavutil/x86/float_dsp.asm
+@@ -44,10 +44,8 @@ ALIGN 16
+ 
+ INIT_XMM sse
+ VECTOR_FMUL
+-%if HAVE_AVX_EXTERNAL
+ INIT_YMM avx
+ VECTOR_FMUL
+-%endif
+ 
+ ;------------------------------------------------------------------------------
+ ; void ff_vector_fmac_scalar(float *dst, const float *src, float mul, int len)
+@@ -85,7 +83,5 @@ cglobal vector_fmac_scalar, 4,4,3, dst, src, mul, len
+ 
+ INIT_XMM sse
+ VECTOR_FMAC_SCALAR
+-%if HAVE_AVX_EXTERNAL
+ INIT_YMM avx
+ VECTOR_FMAC_SCALAR
+-%endif
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0210-binkaudio-set-channel-layout.patch b/debian/patches/post-9beta2/0210-binkaudio-set-channel-layout.patch
new file mode 100644
index 0000000..d521767
--- /dev/null
+++ b/debian/patches/post-9beta2/0210-binkaudio-set-channel-layout.patch
@@ -0,0 +1,33 @@
+From faf340f60c18c0af282570eed156ec67c1d98f6f Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 12:10:59 -0400
+Subject: [PATCH 210/278] binkaudio: set channel layout
+
+---
+ libavcodec/binkaudio.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c
+index af56526..3a138e5 100644
+--- a/libavcodec/binkaudio.c
++++ b/libavcodec/binkaudio.c
+@@ -28,6 +28,7 @@
+  *  http://wiki.multimedia.cx/index.php?title=Bink_Audio
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "avcodec.h"
+ #define BITSTREAM_READER_LE
+ #include "get_bits.h"
+@@ -87,6 +88,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
+         av_log(avctx, AV_LOG_ERROR, "too many channels: %d\n", avctx->channels);
+         return -1;
+     }
++    avctx->channel_layout = avctx->channels == 1 ? AV_CH_LAYOUT_MONO :
++                                                   AV_CH_LAYOUT_STEREO;
+ 
+     s->version_b = avctx->extradata && avctx->extradata[3] == 'b';
+ 
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0211-configure-remove-support-for-n-flag-in-print_enabled.patch b/debian/patches/post-9beta2/0211-configure-remove-support-for-n-flag-in-print_enabled.patch
new file mode 100644
index 0000000..8f58ecb
--- /dev/null
+++ b/debian/patches/post-9beta2/0211-configure-remove-support-for-n-flag-in-print_enabled.patch
@@ -0,0 +1,33 @@
+From 9eda2a85c64e5551fd5ee47285834e7b33b48080 Mon Sep 17 00:00:00 2001
+From: Mans Rullgard <mans at mansr.com>
+Date: Sat, 27 Oct 2012 19:11:04 +0100
+Subject: [PATCH 211/278] configure: remove support for -n flag in
+ print_enabled()
+
+This flag is no longer used.
+
+Signed-off-by: Mans Rullgard <mans at mansr.com>
+---
+ configure |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index a66a7ff..163b742 100755
+--- a/configure
++++ b/configure
+@@ -592,11 +592,10 @@ print_config(){
+ }
+ 
+ print_enabled(){
+-    test x"$1" = x-n && end=" " && shift || end="\n"
+     suf=$1
+     shift
+     for v; do
+-        enabled $v && printf "%s$end" ${v%$suf};
++        enabled $v && printf "%s\n" ${v%$suf};
+     done
+ }
+ 
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0212-ppc-fix-some-unused-variable-warnings.patch b/debian/patches/post-9beta2/0212-ppc-fix-some-unused-variable-warnings.patch
new file mode 100644
index 0000000..510e5d3
--- /dev/null
+++ b/debian/patches/post-9beta2/0212-ppc-fix-some-unused-variable-warnings.patch
@@ -0,0 +1,80 @@
+From 031aac9861dbd2d6e195f63e585cebe711db9d49 Mon Sep 17 00:00:00 2001
+From: Mans Rullgard <mans at mansr.com>
+Date: Sat, 10 Nov 2012 13:16:29 +0000
+Subject: [PATCH 212/278] ppc: fix some unused variable warnings
+
+The third argument of OP_U8_ALTIVEC is evaluated at most once so
+there is no need for a potentially unused temporary variable.
+
+Signed-off-by: Mans Rullgard <mans at mansr.com>
+---
+ libavcodec/ppc/h264_altivec_template.c |   15 ++++++---------
+ 1 file changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/libavcodec/ppc/h264_altivec_template.c b/libavcodec/ppc/h264_altivec_template.c
+index 0964bbe..b445f92 100644
+--- a/libavcodec/ppc/h264_altivec_template.c
++++ b/libavcodec/ppc/h264_altivec_template.c
+@@ -322,7 +322,7 @@ static void PREFIX_h264_qpel16_h_lowpass_altivec(uint8_t * dst, uint8_t * src, i
+               pp1A, pp1B, pp2A, pp2B, pp3A, pp3B,
+               psumA, psumB, sumA, sumB;
+ 
+-    vec_u8 sum, vdst, fsum;
++    vec_u8 sum, fsum;
+ 
+     for (i = 0 ; i < 16 ; i ++) {
+         vec_u8 srcR1 = vec_ld(-2, src);
+@@ -423,9 +423,8 @@ static void PREFIX_h264_qpel16_h_lowpass_altivec(uint8_t * dst, uint8_t * src, i
+         sum = vec_packsu(sumA, sumB);
+ 
+         ASSERT_ALIGNED(dst);
+-        vdst = vec_ld(0, dst);
+ 
+-        OP_U8_ALTIVEC(fsum, sum, vdst);
++        OP_U8_ALTIVEC(fsum, sum, vec_ld(0, dst));
+ 
+         vec_st(fsum, 0, dst);
+ 
+@@ -486,7 +485,7 @@ static void PREFIX_h264_qpel16_v_lowpass_altivec(uint8_t * dst, uint8_t * src, i
+               srcP3ssA, srcP3ssB,
+               sum1A, sum1B, sum2A, sum2B, sum3A, sum3B;
+ 
+-    vec_u8 sum, vdst, fsum, srcP3a, srcP3b, srcP3;
++    vec_u8 sum, fsum, srcP3a, srcP3b, srcP3;
+ 
+     for (i = 0 ; i < 16 ; i++) {
+         srcP3a = vec_ld(0, srcbis += srcStride);
+@@ -532,9 +531,8 @@ static void PREFIX_h264_qpel16_v_lowpass_altivec(uint8_t * dst, uint8_t * src, i
+         sum = vec_packsu(sumA, sumB);
+ 
+         ASSERT_ALIGNED(dst);
+-        vdst = vec_ld(0, dst);
+ 
+-        OP_U8_ALTIVEC(fsum, sum, vdst);
++        OP_U8_ALTIVEC(fsum, sum, vec_ld(0, dst));
+ 
+         vec_st(fsum, 0, dst);
+ 
+@@ -582,7 +580,7 @@ static void PREFIX_h264_qpel16_hv_lowpass_altivec(uint8_t * dst, int16_t * tmp,
+               pp3Ae, pp3Ao, pp3Be, pp3Bo, pp1cAe, pp1cAo, pp1cBe, pp1cBo,
+               pp32Ae, pp32Ao, pp32Be, pp32Bo, sumAe, sumAo, sumBe, sumBo,
+               ssumAe, ssumAo, ssumBe, ssumBo;
+-    vec_u8 fsum, sumv, sum, vdst;
++    vec_u8 fsum, sumv, sum;
+     vec_s16 ssume, ssumo;
+ 
+     src -= (2 * srcStride);
+@@ -766,9 +764,8 @@ static void PREFIX_h264_qpel16_hv_lowpass_altivec(uint8_t * dst, int16_t * tmp,
+         sum = vec_perm(sumv, sumv, mperm);
+ 
+         ASSERT_ALIGNED(dst);
+-        vdst = vec_ld(0, dst);
+ 
+-        OP_U8_ALTIVEC(fsum, sum, vdst);
++        OP_U8_ALTIVEC(fsum, sum, vec_ld(0, dst));
+ 
+         vec_st(fsum, 0, dst);
+ 
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0213-ppc-replace-pointer-casting-with-AV_COPY32.patch b/debian/patches/post-9beta2/0213-ppc-replace-pointer-casting-with-AV_COPY32.patch
new file mode 100644
index 0000000..a60ddda
--- /dev/null
+++ b/debian/patches/post-9beta2/0213-ppc-replace-pointer-casting-with-AV_COPY32.patch
@@ -0,0 +1,36 @@
+From a384f6a7f73a8bd53046dd95a1ca0ac785d4add3 Mon Sep 17 00:00:00 2001
+From: Mans Rullgard <mans at mansr.com>
+Date: Sat, 10 Nov 2012 13:21:52 +0000
+Subject: [PATCH 213/278] ppc: replace pointer casting with AV_COPY32
+
+This removes warnings about strict aliasing violations.
+
+Signed-off-by: Mans Rullgard <mans at mansr.com>
+---
+ libavcodec/ppc/h264_altivec.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libavcodec/ppc/h264_altivec.c b/libavcodec/ppc/h264_altivec.c
+index 05a5c51..73e2adb 100644
+--- a/libavcodec/ppc/h264_altivec.c
++++ b/libavcodec/ppc/h264_altivec.c
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include "libavutil/cpu.h"
++#include "libavutil/intreadwrite.h"
+ #include "libavutil/ppc/types_altivec.h"
+ #include "libavutil/ppc/util_altivec.h"
+ #include "libavcodec/dsputil.h"
+@@ -788,7 +789,7 @@ static inline vec_u8 h264_deblock_q1(register vec_u8 p0,
+     alphavec = vec_splat(alphavec, 0x0);                                                     \
+     mask = h264_deblock_mask(p0, p1, q0, q1, alphavec, betavec); /*if in block */            \
+                                                                                              \
+-    *((int *)temp) = *((int *)tc0);                                                          \
++    AV_COPY32(temp, tc0);                                                                    \
+     tc0vec = vec_ld(0, (signed char*)temp);                                                  \
+     tc0vec = vec_mergeh(tc0vec, tc0vec);                                                     \
+     tc0vec = vec_mergeh(tc0vec, tc0vec);                                                     \
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0214-amr-set-channel_layout.patch b/debian/patches/post-9beta2/0214-amr-set-channel_layout.patch
new file mode 100644
index 0000000..e8bce9d
--- /dev/null
+++ b/debian/patches/post-9beta2/0214-amr-set-channel_layout.patch
@@ -0,0 +1,33 @@
+From 5595368bcc6df7d307876bc051f41a8c72f38ce9 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 11:07:16 -0400
+Subject: [PATCH 214/278] amr: set channel_layout
+
+---
+ libavformat/amr.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libavformat/amr.c b/libavformat/amr.c
+index cc4842e..ba91d7c 100644
+--- a/libavformat/amr.c
++++ b/libavformat/amr.c
+@@ -25,6 +25,8 @@ Write and read amr data according to RFC3267, http://www.ietf.org/rfc/rfc3267.tx
+ Only mono files are supported.
+ 
+ */
++
++#include "libavutil/channel_layout.h"
+ #include "avformat.h"
+ #include "internal.h"
+ 
+@@ -97,6 +99,7 @@ static int amr_read_header(AVFormatContext *s)
+         st->codec->sample_rate = 8000;
+     }
+     st->codec->channels   = 1;
++    st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+     st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+     avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
+ 
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0215-apc-set-channel-layout.patch b/debian/patches/post-9beta2/0215-apc-set-channel-layout.patch
new file mode 100644
index 0000000..be6a2fe
--- /dev/null
+++ b/debian/patches/post-9beta2/0215-apc-set-channel-layout.patch
@@ -0,0 +1,42 @@
+From 39f0e9b8c6f7d99cbf0a3c1784eb6f20bf88ac3a Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 11:25:52 -0400
+Subject: [PATCH 215/278] apc: set channel layout
+
+---
+ libavformat/apc.c |   12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/libavformat/apc.c b/libavformat/apc.c
+index 7ae2423..0b6c583 100644
+--- a/libavformat/apc.c
++++ b/libavformat/apc.c
+@@ -20,6 +20,8 @@
+  */
+ 
+ #include <string.h>
++
++#include "libavutil/channel_layout.h"
+ #include "avformat.h"
+ 
+ static int apc_probe(AVProbeData *p)
+@@ -58,9 +60,13 @@ static int apc_read_header(AVFormatContext *s)
+     /* initial predictor values for adpcm decoder */
+     avio_read(pb, st->codec->extradata, 2 * 4);
+ 
+-    st->codec->channels = 1;
+-    if (avio_rl32(pb))
+-        st->codec->channels = 2;
++    if (avio_rl32(pb)) {
++        st->codec->channels       = 2;
++        st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
++    } else {
++        st->codec->channels       = 1;
++        st->codec->channel_layout = AV_CH_LAYOUT_MONO;
++    }
+ 
+     st->codec->bits_per_coded_sample = 4;
+     st->codec->bit_rate = st->codec->bits_per_coded_sample * st->codec->channels
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0216-bethsoftvid-set-channel-layout.patch b/debian/patches/post-9beta2/0216-bethsoftvid-set-channel-layout.patch
new file mode 100644
index 0000000..b74d29a
--- /dev/null
+++ b/debian/patches/post-9beta2/0216-bethsoftvid-set-channel-layout.patch
@@ -0,0 +1,32 @@
+From b5d1a15d1b298f466c848c0454ef546ec135be14 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 12:05:36 -0400
+Subject: [PATCH 216/278] bethsoftvid: set channel layout
+
+---
+ libavformat/bethsoftvid.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libavformat/bethsoftvid.c b/libavformat/bethsoftvid.c
+index ece230c..3a102c0 100644
+--- a/libavformat/bethsoftvid.c
++++ b/libavformat/bethsoftvid.c
+@@ -27,6 +27,7 @@
+  * @see http://www.svatopluk.com/andux/docs/dfvid.html
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avformat.h"
+ #include "internal.h"
+@@ -239,6 +240,7 @@ static int vid_read_packet(AVFormatContext *s,
+                 st->codec->codec_type            = AVMEDIA_TYPE_AUDIO;
+                 st->codec->codec_id              = AV_CODEC_ID_PCM_U8;
+                 st->codec->channels              = 1;
++                st->codec->channel_layout        = AV_CH_LAYOUT_MONO;
+                 st->codec->bits_per_coded_sample = 8;
+                 st->codec->sample_rate           = vid->sample_rate;
+                 st->codec->bit_rate              = 8 * st->codec->sample_rate;
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0217-bfi-set-channel-layout.patch b/debian/patches/post-9beta2/0217-bfi-set-channel-layout.patch
new file mode 100644
index 0000000..a67b232
--- /dev/null
+++ b/debian/patches/post-9beta2/0217-bfi-set-channel-layout.patch
@@ -0,0 +1,32 @@
+From ff50d27a6391663be2332ec242de23131ac74034 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 12:06:41 -0400
+Subject: [PATCH 217/278] bfi: set channel layout
+
+---
+ libavformat/bfi.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libavformat/bfi.c b/libavformat/bfi.c
+index c520bea..e60bbf4 100644
+--- a/libavformat/bfi.c
++++ b/libavformat/bfi.c
+@@ -26,6 +26,7 @@
+  * @see http://wiki.multimedia.cx/index.php?title=BFI
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avformat.h"
+ #include "internal.h"
+@@ -96,6 +97,7 @@ static int bfi_read_header(AVFormatContext * s)
+     astream->codec->codec_type      = AVMEDIA_TYPE_AUDIO;
+     astream->codec->codec_id        = AV_CODEC_ID_PCM_U8;
+     astream->codec->channels        = 1;
++    astream->codec->channel_layout  = AV_CH_LAYOUT_MONO;
+     astream->codec->bits_per_coded_sample = 8;
+     astream->codec->bit_rate        =
+         astream->codec->sample_rate * astream->codec->bits_per_coded_sample;
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0218-bink-set-channel-layout.patch b/debian/patches/post-9beta2/0218-bink-set-channel-layout.patch
new file mode 100644
index 0000000..213b817
--- /dev/null
+++ b/debian/patches/post-9beta2/0218-bink-set-channel-layout.patch
@@ -0,0 +1,39 @@
+From 2fe804f316db5d58974d43f05299cc6d14b975ed Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 12:10:46 -0400
+Subject: [PATCH 218/278] bink: set channel layout
+
+---
+ libavformat/bink.c |    9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/libavformat/bink.c b/libavformat/bink.c
+index 7254caf..5d3de14 100644
+--- a/libavformat/bink.c
++++ b/libavformat/bink.c
+@@ -28,6 +28,7 @@
+  *  http://wiki.multimedia.cx/index.php?title=Bink_Container
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avformat.h"
+ #include "internal.h"
+@@ -141,7 +142,13 @@ static int read_header(AVFormatContext *s)
+             flags = avio_rl16(pb);
+             ast->codec->codec_id = flags & BINK_AUD_USEDCT ?
+                                    AV_CODEC_ID_BINKAUDIO_DCT : AV_CODEC_ID_BINKAUDIO_RDFT;
+-            ast->codec->channels = flags & BINK_AUD_STEREO ? 2 : 1;
++            if (flags & BINK_AUD_STEREO) {
++                ast->codec->channels       = 2;
++                ast->codec->channel_layout = AV_CH_LAYOUT_STEREO;
++            } else {
++                ast->codec->channels       = 1;
++                ast->codec->channel_layout = AV_CH_LAYOUT_MONO;
++            }
+             ast->codec->extradata = av_mallocz(4 + FF_INPUT_BUFFER_PADDING_SIZE);
+             if (!ast->codec->extradata)
+                 return AVERROR(ENOMEM);
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0219-bmv-set-channel-layout.patch b/debian/patches/post-9beta2/0219-bmv-set-channel-layout.patch
new file mode 100644
index 0000000..c066027
--- /dev/null
+++ b/debian/patches/post-9beta2/0219-bmv-set-channel-layout.patch
@@ -0,0 +1,32 @@
+From e8088d6e4b1255a8a5969ef925e4eb3a01f0988b Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 12:12:35 -0400
+Subject: [PATCH 219/278] bmv: set channel layout
+
+---
+ libavformat/bmv.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libavformat/bmv.c b/libavformat/bmv.c
+index fe5db3f..ce157e8 100644
+--- a/libavformat/bmv.c
++++ b/libavformat/bmv.c
+@@ -19,6 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "avformat.h"
+ #include "internal.h"
+ 
+@@ -58,6 +59,7 @@ static int bmv_read_header(AVFormatContext *s)
+     ast->codec->codec_type      = AVMEDIA_TYPE_AUDIO;
+     ast->codec->codec_id        = AV_CODEC_ID_BMV_AUDIO;
+     ast->codec->channels        = 2;
++    ast->codec->channel_layout  = AV_CH_LAYOUT_STEREO;
+     ast->codec->sample_rate     = 22050;
+     avpriv_set_pts_info(ast, 16, 1, 22050);
+ 
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0220-cdxl-set-channel-layout.patch b/debian/patches/post-9beta2/0220-cdxl-set-channel-layout.patch
new file mode 100644
index 0000000..ca3eb56
--- /dev/null
+++ b/debian/patches/post-9beta2/0220-cdxl-set-channel-layout.patch
@@ -0,0 +1,39 @@
+From 0d09a5848f49d37d77980f28cde9ad1987ce1eb4 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 12:49:11 -0400
+Subject: [PATCH 220/278] cdxl: set channel layout
+
+---
+ libavformat/cdxl.c |    9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/libavformat/cdxl.c b/libavformat/cdxl.c
+index d61cbd9..a2cba52 100644
+--- a/libavformat/cdxl.c
++++ b/libavformat/cdxl.c
+@@ -19,6 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "libavutil/parseutils.h"
+ #include "libavutil/opt.h"
+@@ -101,7 +102,13 @@ static int cdxl_read_packet(AVFormatContext *s, AVPacket *pkt)
+             st->codec->codec_type    = AVMEDIA_TYPE_AUDIO;
+             st->codec->codec_tag     = 0;
+             st->codec->codec_id      = AV_CODEC_ID_PCM_S8;
+-            st->codec->channels      = cdxl->header[1] & 0x10 ? 2 : 1;
++            if (cdxl->header[1] & 0x10) {
++                st->codec->channels       = 2;
++                st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
++            } else {
++                st->codec->channels       = 1;
++                st->codec->channel_layout = AV_CH_LAYOUT_MONO;
++            }
+             st->codec->sample_rate   = cdxl->sample_rate;
+             st->start_time           = 0;
+             cdxl->audio_stream_index = st->index;
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0221-daud-set-channel-layout.patch b/debian/patches/post-9beta2/0221-daud-set-channel-layout.patch
new file mode 100644
index 0000000..e8392ea
--- /dev/null
+++ b/debian/patches/post-9beta2/0221-daud-set-channel-layout.patch
@@ -0,0 +1,34 @@
+From a05a63785c4769a1f3c3cddcc876c5acb6cf4c83 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 12:55:12 -0400
+Subject: [PATCH 221/278] daud: set channel layout
+
+Update FATE reference due to WAVE channel mask now being set correctly.
+---
+ libavformat/daud.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libavformat/daud.c b/libavformat/daud.c
+index dda83f9..3ceb958 100644
+--- a/libavformat/daud.c
++++ b/libavformat/daud.c
+@@ -18,6 +18,8 @@
+  * License along with Libav; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
++
++#include "libavutil/channel_layout.h"
+ #include "avformat.h"
+ 
+ static int daud_header(AVFormatContext *s) {
+@@ -28,6 +30,7 @@ static int daud_header(AVFormatContext *s) {
+     st->codec->codec_id = AV_CODEC_ID_PCM_S24DAUD;
+     st->codec->codec_tag = MKTAG('d', 'a', 'u', 'd');
+     st->codec->channels = 6;
++    st->codec->channel_layout = AV_CH_LAYOUT_5POINT1;
+     st->codec->sample_rate = 96000;
+     st->codec->bit_rate = 3 * 6 * 96000 * 8;
+     st->codec->block_align = 3 * 6;
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0222-dsicin-set-channel-layout.patch b/debian/patches/post-9beta2/0222-dsicin-set-channel-layout.patch
new file mode 100644
index 0000000..c1a191f
--- /dev/null
+++ b/debian/patches/post-9beta2/0222-dsicin-set-channel-layout.patch
@@ -0,0 +1,32 @@
+From 49e7af06f2fc68c9031cf7b67fe1cba066e2ace2 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 12:56:51 -0400
+Subject: [PATCH 222/278] dsicin: set channel layout
+
+---
+ libavformat/dsicin.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libavformat/dsicin.c b/libavformat/dsicin.c
+index 8cba461..ecc8c0b 100644
+--- a/libavformat/dsicin.c
++++ b/libavformat/dsicin.c
+@@ -24,6 +24,7 @@
+  * Delphine Software International CIN file demuxer
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avformat.h"
+ #include "internal.h"
+@@ -131,6 +132,7 @@ static int cin_read_header(AVFormatContext *s)
+     st->codec->codec_id = AV_CODEC_ID_DSICINAUDIO;
+     st->codec->codec_tag = 0;  /* no tag */
+     st->codec->channels = 1;
++    st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+     st->codec->sample_rate = 22050;
+     st->codec->bits_per_coded_sample = 8;
+     st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_coded_sample * st->codec->channels;
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0223-dv-set-channel-layout.patch b/debian/patches/post-9beta2/0223-dv-set-channel-layout.patch
new file mode 100644
index 0000000..9cc0c34
--- /dev/null
+++ b/debian/patches/post-9beta2/0223-dv-set-channel-layout.patch
@@ -0,0 +1,32 @@
+From d5ca70b10302b47c70c6bc25400125b30d2ef619 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 12:59:32 -0400
+Subject: [PATCH 223/278] dv: set channel layout
+
+---
+ libavformat/dv.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libavformat/dv.c b/libavformat/dv.c
+index 5ce73f7..1730972 100644
+--- a/libavformat/dv.c
++++ b/libavformat/dv.c
+@@ -33,6 +33,7 @@
+ #include "internal.h"
+ #include "libavcodec/dv_profile.h"
+ #include "libavcodec/dvdata.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "libavutil/mathematics.h"
+ #include "dv.h"
+@@ -246,6 +247,7 @@ static int dv_extract_audio_info(DVDemuxContext* c, uint8_t* frame)
+         }
+         c->ast[i]->codec->sample_rate = dv_audio_frequency[freq];
+         c->ast[i]->codec->channels    = 2;
++        c->ast[i]->codec->channel_layout = AV_CH_LAYOUT_STEREO;
+         c->ast[i]->codec->bit_rate    = 2 * dv_audio_frequency[freq] * 16;
+         c->ast[i]->start_time         = 0;
+     }
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0224-flvdec-set-channel-layout.patch b/debian/patches/post-9beta2/0224-flvdec-set-channel-layout.patch
new file mode 100644
index 0000000..4451852
--- /dev/null
+++ b/debian/patches/post-9beta2/0224-flvdec-set-channel-layout.patch
@@ -0,0 +1,41 @@
+From 644d8d2e5abcad4e6cd2d5761b4f97813fbda96f Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 13:31:40 -0400
+Subject: [PATCH 224/278] flvdec: set channel layout
+
+---
+ libavformat/flvdec.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
+index 868cc6b..7d5ea56 100644
+--- a/libavformat/flvdec.c
++++ b/libavformat/flvdec.c
+@@ -25,6 +25,7 @@
+  */
+ 
+ #include "libavutil/avstring.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/dict.h"
+ #include "libavutil/opt.h"
+ #include "libavutil/intfloat.h"
+@@ -749,6 +750,8 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
+         bits_per_coded_sample = (flags & FLV_AUDIO_SAMPLESIZE_MASK) ? 16 : 8;
+         if(!st->codec->channels || !st->codec->sample_rate || !st->codec->bits_per_coded_sample) {
+             st->codec->channels              = channels;
++            st->codec->channel_layout        = channels == 1 ? AV_CH_LAYOUT_MONO :
++                                                               AV_CH_LAYOUT_STEREO;
+             st->codec->sample_rate           = sample_rate;
+             st->codec->bits_per_coded_sample = bits_per_coded_sample;
+         }
+@@ -794,6 +797,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
+                 avpriv_mpeg4audio_get_config(&cfg, st->codec->extradata,
+                                              st->codec->extradata_size * 8, 1);
+                 st->codec->channels = cfg.channels;
++                st->codec->channel_layout = 0;
+                 if (cfg.ext_sample_rate)
+                     st->codec->sample_rate = cfg.ext_sample_rate;
+                 else
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0225-gsmdec-set-channel-layout.patch b/debian/patches/post-9beta2/0225-gsmdec-set-channel-layout.patch
new file mode 100644
index 0000000..09ee1ce
--- /dev/null
+++ b/debian/patches/post-9beta2/0225-gsmdec-set-channel-layout.patch
@@ -0,0 +1,32 @@
+From d4a105ae5c1b0c6118872c8b729c3ac751281ed0 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 13:51:42 -0400
+Subject: [PATCH 225/278] gsmdec: set channel layout
+
+---
+ libavformat/gsmdec.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libavformat/gsmdec.c b/libavformat/gsmdec.c
+index f0cb279..f9ecbaf 100644
+--- a/libavformat/gsmdec.c
++++ b/libavformat/gsmdec.c
+@@ -19,6 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/mathematics.h"
+ #include "libavutil/opt.h"
+ #include "avformat.h"
+@@ -64,6 +65,7 @@ static int gsm_read_header(AVFormatContext *s)
+     st->codec->codec_type  = AVMEDIA_TYPE_AUDIO;
+     st->codec->codec_id    = s->iformat->raw_codec_id;
+     st->codec->channels    = 1;
++    st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+     st->codec->sample_rate = c->sample_rate;
+     st->codec->bit_rate    = GSM_BLOCK_SIZE * 8 * c->sample_rate / GSM_BLOCK_SAMPLES;
+ 
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0226-gxfdec-set-channel-layout-when-applicable.patch b/debian/patches/post-9beta2/0226-gxfdec-set-channel-layout-when-applicable.patch
new file mode 100644
index 0000000..2fa5944
--- /dev/null
+++ b/debian/patches/post-9beta2/0226-gxfdec-set-channel-layout-when-applicable.patch
@@ -0,0 +1,48 @@
+From f6c3adde41921082964055193efbcf58195bf457 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 14:00:04 -0400
+Subject: [PATCH 226/278] gxfdec: set channel layout when applicable
+
+---
+ libavformat/gxf.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libavformat/gxf.c b/libavformat/gxf.c
+index 2593c06..6feb3c3 100644
+--- a/libavformat/gxf.c
++++ b/libavformat/gxf.c
+@@ -19,6 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+ #include "avformat.h"
+ #include "internal.h"
+@@ -119,6 +120,7 @@ static int get_sindex(AVFormatContext *s, int id, int format) {
+             st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+             st->codec->codec_id = AV_CODEC_ID_PCM_S24LE;
+             st->codec->channels = 1;
++            st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+             st->codec->sample_rate = 48000;
+             st->codec->bit_rate = 3 * 1 * 48000 * 8;
+             st->codec->block_align = 3 * 1;
+@@ -128,6 +130,7 @@ static int get_sindex(AVFormatContext *s, int id, int format) {
+             st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+             st->codec->codec_id = AV_CODEC_ID_PCM_S16LE;
+             st->codec->channels = 1;
++            st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+             st->codec->sample_rate = 48000;
+             st->codec->bit_rate = 2 * 1 * 48000 * 8;
+             st->codec->block_align = 2 * 1;
+@@ -137,6 +140,7 @@ static int get_sindex(AVFormatContext *s, int id, int format) {
+             st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+             st->codec->codec_id = AV_CODEC_ID_AC3;
+             st->codec->channels = 2;
++            st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
+             st->codec->sample_rate = 48000;
+             break;
+         // timecode tracks:
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0227-idroqdec-set-channel-layout.patch b/debian/patches/post-9beta2/0227-idroqdec-set-channel-layout.patch
new file mode 100644
index 0000000..cf8eb30
--- /dev/null
+++ b/debian/patches/post-9beta2/0227-idroqdec-set-channel-layout.patch
@@ -0,0 +1,40 @@
+From 73e2007f3d435dec6a5ddb6a47e706cc419eb7cd Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 14:03:43 -0400
+Subject: [PATCH 227/278] idroqdec: set channel layout
+
+---
+ libavformat/idroqdec.c |   10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/libavformat/idroqdec.c b/libavformat/idroqdec.c
+index 521f586..eeaafec 100644
+--- a/libavformat/idroqdec.c
++++ b/libavformat/idroqdec.c
+@@ -27,6 +27,7 @@
+  *   http://www.csse.monash.edu.au/~timf/
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avformat.h"
+ #include "internal.h"
+@@ -175,7 +176,14 @@ static int roq_read_packet(AVFormatContext *s,
+                 st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+                 st->codec->codec_id = AV_CODEC_ID_ROQ_DPCM;
+                 st->codec->codec_tag = 0;  /* no tag */
+-                st->codec->channels = roq->audio_channels = chunk_type == RoQ_SOUND_STEREO ? 2 : 1;
++                if (chunk_type == RoQ_SOUND_STEREO) {
++                    st->codec->channels       = 2;
++                    st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
++                } else {
++                    st->codec->channels       = 1;
++                    st->codec->channel_layout = AV_CH_LAYOUT_MONO;
++                }
++                roq->audio_channels    = st->codec->channels;
+                 st->codec->sample_rate = RoQ_AUDIO_SAMPLE_RATE;
+                 st->codec->bits_per_coded_sample = 16;
+                 st->codec->bit_rate = st->codec->channels * st->codec->sample_rate *
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0228-iff-set-channel-layout.patch b/debian/patches/post-9beta2/0228-iff-set-channel-layout.patch
new file mode 100644
index 0000000..d8a8df9
--- /dev/null
+++ b/debian/patches/post-9beta2/0228-iff-set-channel-layout.patch
@@ -0,0 +1,47 @@
+From 024e03701c706d3976348b9f50a1af7db2137a39 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 14:05:45 -0400
+Subject: [PATCH 228/278] iff: set channel layout
+
+---
+ libavformat/iff.c |   10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/libavformat/iff.c b/libavformat/iff.c
+index c2bc283..ab22e11 100644
+--- a/libavformat/iff.c
++++ b/libavformat/iff.c
+@@ -29,6 +29,7 @@
+  * http://wiki.multimedia.cx/index.php?title=IFF
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "libavutil/dict.h"
+ #include "avformat.h"
+@@ -120,6 +121,7 @@ static int iff_read_header(AVFormatContext *s)
+         return AVERROR(ENOMEM);
+ 
+     st->codec->channels = 1;
++    st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+     avio_skip(pb, 8);
+     // codec_tag used by ByteRun1 decoder to distinguish progressive (PBM) and interlaced (ILBM) content
+     st->codec->codec_tag = avio_rl32(pb);
+@@ -154,7 +156,13 @@ static int iff_read_header(AVFormatContext *s)
+         case ID_CHAN:
+             if (data_size < 4)
+                 return AVERROR_INVALIDDATA;
+-            st->codec->channels = (avio_rb32(pb) < 6) ? 1 : 2;
++            if (avio_rb32(pb) < 6) {
++                st->codec->channels       = 1;
++                st->codec->channel_layout = AV_CH_LAYOUT_MONO;
++            } else {
++                st->codec->channels       = 2;
++                st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
++            }
+             break;
+ 
+         case ID_CMAP:
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0229-ipmovie-set-channel-layout.patch b/debian/patches/post-9beta2/0229-ipmovie-set-channel-layout.patch
new file mode 100644
index 0000000..fabb82d
--- /dev/null
+++ b/debian/patches/post-9beta2/0229-ipmovie-set-channel-layout.patch
@@ -0,0 +1,33 @@
+From 41a2d9590d89c3f240b1ef875649852197d945eb Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 16:44:46 -0400
+Subject: [PATCH 229/278] ipmovie: set channel layout
+
+---
+ libavformat/ipmovie.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c
+index b567fb2..60ae939 100644
+--- a/libavformat/ipmovie.c
++++ b/libavformat/ipmovie.c
+@@ -32,6 +32,7 @@
+  * up and sending out the chunks.
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avformat.h"
+ #include "internal.h"
+@@ -600,6 +601,8 @@ static int ipmovie_read_header(AVFormatContext *s)
+         st->codec->codec_id = ipmovie->audio_type;
+         st->codec->codec_tag = 0;  /* no tag */
+         st->codec->channels = ipmovie->audio_channels;
++        st->codec->channel_layout = st->codec->channels == 1 ? AV_CH_LAYOUT_MONO :
++                                                               AV_CH_LAYOUT_STEREO;
+         st->codec->sample_rate = ipmovie->audio_sample_rate;
+         st->codec->bits_per_coded_sample = ipmovie->audio_bits;
+         st->codec->bit_rate = st->codec->channels * st->codec->sample_rate *
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0230-iss-set-channel-layout.patch b/debian/patches/post-9beta2/0230-iss-set-channel-layout.patch
new file mode 100644
index 0000000..8c320bc
--- /dev/null
+++ b/debian/patches/post-9beta2/0230-iss-set-channel-layout.patch
@@ -0,0 +1,39 @@
+From 43711312831504c42d2db3bbeafc893883bee911 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 16:45:48 -0400
+Subject: [PATCH 230/278] iss: set channel layout
+
+---
+ libavformat/iss.c |    9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/libavformat/iss.c b/libavformat/iss.c
+index 14f64d2..3f7f4fe 100644
+--- a/libavformat/iss.c
++++ b/libavformat/iss.c
+@@ -26,6 +26,7 @@
+  * @see http://wiki.multimedia.cx/index.php?title=FunCom_ISS
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "avformat.h"
+ #include "internal.h"
+ #include "libavutil/avstring.h"
+@@ -94,7 +95,13 @@ static av_cold int iss_read_header(AVFormatContext *s)
+         return AVERROR(ENOMEM);
+     st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+     st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_ISS;
+-    st->codec->channels = stereo ? 2 : 1;
++    if (stereo) {
++        st->codec->channels       = 2;
++        st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
++    } else {
++        st->codec->channels       = 1;
++        st->codec->channel_layout = AV_CH_LAYOUT_MONO;
++    }
+     st->codec->sample_rate = 44100;
+     if(rate_divisor > 0)
+          st->codec->sample_rate /= rate_divisor;
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0231-jvdec-set-channel-layout.patch b/debian/patches/post-9beta2/0231-jvdec-set-channel-layout.patch
new file mode 100644
index 0000000..b4e7856
--- /dev/null
+++ b/debian/patches/post-9beta2/0231-jvdec-set-channel-layout.patch
@@ -0,0 +1,32 @@
+From ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 16:47:15 -0400
+Subject: [PATCH 231/278] jvdec: set channel layout
+
+---
+ libavformat/jvdec.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libavformat/jvdec.c b/libavformat/jvdec.c
+index 47a6142..cf9df8c 100644
+--- a/libavformat/jvdec.c
++++ b/libavformat/jvdec.c
+@@ -25,6 +25,7 @@
+  * @author Peter Ross <pross at xvid.org>
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avformat.h"
+ #include "internal.h"
+@@ -91,6 +92,7 @@ static int read_header(AVFormatContext *s)
+     ast->codec->codec_tag   = 0; /* no fourcc */
+     ast->codec->sample_rate = avio_rl16(pb);
+     ast->codec->channels    = 1;
++    ast->codec->channel_layout = AV_CH_LAYOUT_MONO;
+     avpriv_set_pts_info(ast, 64, 1, ast->codec->sample_rate);
+ 
+     avio_skip(pb, 10);
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0232-mm-set-channel-layout.patch b/debian/patches/post-9beta2/0232-mm-set-channel-layout.patch
new file mode 100644
index 0000000..5eba1c9
--- /dev/null
+++ b/debian/patches/post-9beta2/0232-mm-set-channel-layout.patch
@@ -0,0 +1,32 @@
+From 87199d34db5d79ad85c0801b29db0709c08f458c Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 16:52:57 -0400
+Subject: [PATCH 232/278] mm: set channel layout
+
+---
+ libavformat/mm.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libavformat/mm.c b/libavformat/mm.c
+index 13f33a2..83539fa 100644
+--- a/libavformat/mm.c
++++ b/libavformat/mm.c
+@@ -31,6 +31,7 @@
+  *  http://wiki.multimedia.cx/index.php?title=American_Laser_Games_MM
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avformat.h"
+ #include "internal.h"
+@@ -124,6 +125,7 @@ static int read_header(AVFormatContext *s)
+         st->codec->codec_tag = 0; /* no fourcc */
+         st->codec->codec_id = AV_CODEC_ID_PCM_U8;
+         st->codec->channels = 1;
++        st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+         st->codec->sample_rate = 8000;
+         avpriv_set_pts_info(st, 64, 1, 8000); /* 8000 hz */
+     }
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0233-mmf-set-channel-layout.patch b/debian/patches/post-9beta2/0233-mmf-set-channel-layout.patch
new file mode 100644
index 0000000..06c46e1
--- /dev/null
+++ b/debian/patches/post-9beta2/0233-mmf-set-channel-layout.patch
@@ -0,0 +1,33 @@
+From f24b0b1b6cc3357637570d28f9a9fa285bec1770 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 16:56:48 -0400
+Subject: [PATCH 233/278] mmf: set channel layout
+
+---
+ libavformat/mmf.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libavformat/mmf.c b/libavformat/mmf.c
+index 06d4a2b..20570f2 100644
+--- a/libavformat/mmf.c
++++ b/libavformat/mmf.c
+@@ -18,6 +18,8 @@
+  * License along with Libav; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
++
++#include "libavutil/channel_layout.h"
+ #include "avformat.h"
+ #include "internal.h"
+ #include "avio_internal.h"
+@@ -249,6 +251,7 @@ static int mmf_read_header(AVFormatContext *s)
+     st->codec->codec_id = AV_CODEC_ID_ADPCM_YAMAHA;
+     st->codec->sample_rate = rate;
+     st->codec->channels = 1;
++    st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+     st->codec->bits_per_coded_sample = 4;
+     st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_coded_sample;
+ 
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0234-mpc7-set-channel-layout.patch b/debian/patches/post-9beta2/0234-mpc7-set-channel-layout.patch
new file mode 100644
index 0000000..9971c7e
--- /dev/null
+++ b/debian/patches/post-9beta2/0234-mpc7-set-channel-layout.patch
@@ -0,0 +1,32 @@
+From f6c6e5aac12edd02f5c62e2efa0d8f5af161eb88 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 17:03:19 -0400
+Subject: [PATCH 234/278] mpc7: set channel layout
+
+---
+ libavformat/mpc.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libavformat/mpc.c b/libavformat/mpc.c
+index fbf8e92..5e771ae 100644
+--- a/libavformat/mpc.c
++++ b/libavformat/mpc.c
+@@ -19,6 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavcodec/get_bits.h"
+ #include "avformat.h"
+ #include "internal.h"
+@@ -91,6 +92,7 @@ static int mpc_read_header(AVFormatContext *s)
+     st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+     st->codec->codec_id = AV_CODEC_ID_MUSEPACK7;
+     st->codec->channels = 2;
++    st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
+     st->codec->bits_per_coded_sample = 16;
+ 
+     st->codec->extradata_size = 16;
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0235-mvi-set-channel-layout.patch b/debian/patches/post-9beta2/0235-mvi-set-channel-layout.patch
new file mode 100644
index 0000000..fbe9115
--- /dev/null
+++ b/debian/patches/post-9beta2/0235-mvi-set-channel-layout.patch
@@ -0,0 +1,32 @@
+From 66d7ceb4aa0a17c72de9a63748953d53a1e95a12 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 17:17:19 -0400
+Subject: [PATCH 235/278] mvi: set channel layout
+
+---
+ libavformat/mvi.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libavformat/mvi.c b/libavformat/mvi.c
+index c5aee5a..10ec8bb 100644
+--- a/libavformat/mvi.c
++++ b/libavformat/mvi.c
+@@ -19,6 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "avformat.h"
+ #include "internal.h"
+ 
+@@ -81,6 +82,7 @@ static int read_header(AVFormatContext *s)
+     ast->codec->codec_type      = AVMEDIA_TYPE_AUDIO;
+     ast->codec->codec_id        = AV_CODEC_ID_PCM_U8;
+     ast->codec->channels        = 1;
++    ast->codec->channel_layout  = AV_CH_LAYOUT_MONO;
+     ast->codec->bits_per_coded_sample = 8;
+     ast->codec->bit_rate        = ast->codec->sample_rate * 8;
+ 
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0236-mxg-set-channel-layout.patch b/debian/patches/post-9beta2/0236-mxg-set-channel-layout.patch
new file mode 100644
index 0000000..5ce077b
--- /dev/null
+++ b/debian/patches/post-9beta2/0236-mxg-set-channel-layout.patch
@@ -0,0 +1,32 @@
+From cc57228e31ace7ab112b7fd86b31cc11dfb405f0 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 17:22:05 -0400
+Subject: [PATCH 236/278] mxg: set channel layout
+
+---
+ libavformat/mxg.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libavformat/mxg.c b/libavformat/mxg.c
+index 09653ee..8959134 100644
+--- a/libavformat/mxg.c
++++ b/libavformat/mxg.c
+@@ -19,6 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "libavcodec/mjpeg.h"
+ #include "avformat.h"
+@@ -56,6 +57,7 @@ static int mxg_read_header(AVFormatContext *s)
+     audio_st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+     audio_st->codec->codec_id = AV_CODEC_ID_PCM_ALAW;
+     audio_st->codec->channels = 1;
++    audio_st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+     audio_st->codec->sample_rate = 8000;
+     audio_st->codec->bits_per_coded_sample = 8;
+     audio_st->codec->block_align = 1;
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0237-nuv-set-channel-layout.patch b/debian/patches/post-9beta2/0237-nuv-set-channel-layout.patch
new file mode 100644
index 0000000..28c273a
--- /dev/null
+++ b/debian/patches/post-9beta2/0237-nuv-set-channel-layout.patch
@@ -0,0 +1,40 @@
+From 232e9c4c4bed38d54c9c55efb8ffc2b12d55b427 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 17:35:20 -0400
+Subject: [PATCH 237/278] nuv: set channel layout
+
+---
+ libavformat/nuv.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libavformat/nuv.c b/libavformat/nuv.c
+index fce96b4..2cbf348 100644
+--- a/libavformat/nuv.c
++++ b/libavformat/nuv.c
+@@ -19,6 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "libavutil/intfloat.h"
+ #include "avformat.h"
+@@ -99,6 +100,7 @@ static int get_codec_data(AVIOContext *pb, AVStream *vst,
+                     ast->codec->sample_rate = avio_rl32(pb);
+                     ast->codec->bits_per_coded_sample = avio_rl32(pb);
+                     ast->codec->channels = avio_rl32(pb);
++                    ast->codec->channel_layout = 0;
+                     ast->codec->codec_id =
+                         ff_wav_codec_get_id(ast->codec->codec_tag,
+                                          ast->codec->bits_per_coded_sample);
+@@ -179,6 +181,7 @@ static int nuv_header(AVFormatContext *s) {
+         ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+         ast->codec->codec_id = AV_CODEC_ID_PCM_S16LE;
+         ast->codec->channels = 2;
++        ast->codec->channel_layout = AV_CH_LAYOUT_STEREO;
+         ast->codec->sample_rate = 44100;
+         ast->codec->bit_rate = 2 * 2 * 44100 * 8;
+         ast->codec->block_align = 2 * 2;
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0238-oggparsespeex-validate-channel-count-and-set-channel.patch b/debian/patches/post-9beta2/0238-oggparsespeex-validate-channel-count-and-set-channel.patch
new file mode 100644
index 0000000..5b39899
--- /dev/null
+++ b/debian/patches/post-9beta2/0238-oggparsespeex-validate-channel-count-and-set-channel.patch
@@ -0,0 +1,38 @@
+From d4088efbe22f2e4f8fc10d63bb50835779a702be Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 17:39:30 -0400
+Subject: [PATCH 238/278] oggparsespeex: validate channel count and set
+ channel layout
+
+---
+ libavformat/oggparsespeex.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/libavformat/oggparsespeex.c b/libavformat/oggparsespeex.c
+index 11b50d5..42480a3 100644
+--- a/libavformat/oggparsespeex.c
++++ b/libavformat/oggparsespeex.c
+@@ -25,6 +25,7 @@
+ #include <stdlib.h>
+ #include "libavutil/bswap.h"
+ #include "libavutil/avstring.h"
++#include "libavutil/channel_layout.h"
+ #include "libavcodec/get_bits.h"
+ #include "libavcodec/bytestream.h"
+ #include "avformat.h"
+@@ -59,6 +60,12 @@ static int speex_header(AVFormatContext *s, int idx) {
+ 
+         st->codec->sample_rate = AV_RL32(p + 36);
+         st->codec->channels = AV_RL32(p + 48);
++        if (st->codec->channels < 1 || st->codec->channels > 2) {
++            av_log(s, AV_LOG_ERROR, "invalid channel count. Speex must be mono or stereo.\n");
++            return AVERROR_INVALIDDATA;
++        }
++        st->codec->channel_layout = st->codec->channels == 1 ? AV_CH_LAYOUT_MONO :
++                                                               AV_CH_LAYOUT_STEREO;
+ 
+         spxp->packet_size  = AV_RL32(p + 56);
+         frames_per_packet  = AV_RL32(p + 64);
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0239-omadec-set-channel-layout.patch b/debian/patches/post-9beta2/0239-omadec-set-channel-layout.patch
new file mode 100644
index 0000000..a13bfef
--- /dev/null
+++ b/debian/patches/post-9beta2/0239-omadec-set-channel-layout.patch
@@ -0,0 +1,40 @@
+From c9759eb426ea997822bf5e6cc43bb24b249e9e25 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 17:53:39 -0400
+Subject: [PATCH 239/278] omadec: set channel layout
+
+---
+ libavformat/omadec.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libavformat/omadec.c b/libavformat/omadec.c
+index 022942d..9b22999 100644
+--- a/libavformat/omadec.c
++++ b/libavformat/omadec.c
+@@ -40,6 +40,7 @@
+  * CODEC SUPPORT: Only ATRAC3 codec is currently supported!
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "avformat.h"
+ #include "internal.h"
+ #include "libavutil/intreadwrite.h"
+@@ -312,6 +313,7 @@ static int oma_read_header(AVFormatContext *s)
+             framesize = (codec_params & 0x3FF) * 8;
+             jsflag = (codec_params >> 17) & 1; /* get stereo coding mode, 1 for joint-stereo */
+             st->codec->channels    = 2;
++            st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
+             st->codec->sample_rate = samplerate;
+             st->codec->bit_rate    = st->codec->sample_rate * framesize * 8 / 1024;
+ 
+@@ -346,6 +348,7 @@ static int oma_read_header(AVFormatContext *s)
+         case OMA_CODECID_LPCM:
+             /* PCM 44.1 kHz 16 bit stereo big-endian */
+             st->codec->channels = 2;
++            st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
+             st->codec->sample_rate = 44100;
+             framesize = 1024;
+             /* bit rate = sample rate x PCM block align (= 4) x 8 */
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0240-psxstr-set-channel-layout.patch b/debian/patches/post-9beta2/0240-psxstr-set-channel-layout.patch
new file mode 100644
index 0000000..87908d0
--- /dev/null
+++ b/debian/patches/post-9beta2/0240-psxstr-set-channel-layout.patch
@@ -0,0 +1,39 @@
+From b5e3e77711c6a4bef8b343d4d419e7ca67425fbc Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 17:56:19 -0400
+Subject: [PATCH 240/278] psxstr: set channel layout
+
+---
+ libavformat/psxstr.c |    9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c
+index 800d9cb..633d61d 100644
+--- a/libavformat/psxstr.c
++++ b/libavformat/psxstr.c
+@@ -29,6 +29,7 @@
+  * RIFF headers, followed by CD sectors.
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avformat.h"
+ #include "internal.h"
+@@ -219,7 +220,13 @@ static int str_read_packet(AVFormatContext *s,
+                 st->codec->codec_type  = AVMEDIA_TYPE_AUDIO;
+                 st->codec->codec_id    = AV_CODEC_ID_ADPCM_XA;
+                 st->codec->codec_tag   = 0;  /* no fourcc */
+-                st->codec->channels    = (fmt&1)?2:1;
++                if (fmt & 1) {
++                    st->codec->channels       = 2;
++                    st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
++                } else {
++                    st->codec->channels       = 1;
++                    st->codec->channel_layout = AV_CH_LAYOUT_MONO;
++                }
+                 st->codec->sample_rate = (fmt&4)?18900:37800;
+             //    st->codec->bit_rate = 0; //FIXME;
+                 st->codec->block_align = 128;
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0241-qcp-set-channel-layout.patch b/debian/patches/post-9beta2/0241-qcp-set-channel-layout.patch
new file mode 100644
index 0000000..2960d46
--- /dev/null
+++ b/debian/patches/post-9beta2/0241-qcp-set-channel-layout.patch
@@ -0,0 +1,32 @@
+From 444b79c18acc057082a2fbdd8d0bedefafbea5fd Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 17:57:25 -0400
+Subject: [PATCH 241/278] qcp: set channel layout
+
+---
+ libavformat/qcp.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libavformat/qcp.c b/libavformat/qcp.c
+index bde5990..30d362f 100644
+--- a/libavformat/qcp.c
++++ b/libavformat/qcp.c
+@@ -27,6 +27,7 @@
+  *     http://tools.ietf.org/html/rfc3625
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avformat.h"
+ 
+@@ -96,6 +97,7 @@ static int qcp_read_header(AVFormatContext *s)
+ 
+     st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+     st->codec->channels   = 1;
++    st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+     avio_read(pb, buf, 16);
+     if (is_qcelp_13k_guid(buf)) {
+         st->codec->codec_id = AV_CODEC_ID_QCELP;
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0242-rmdec-set-channel-layout-for-RA-version-3.patch b/debian/patches/post-9beta2/0242-rmdec-set-channel-layout-for-RA-version-3.patch
new file mode 100644
index 0000000..747f764
--- /dev/null
+++ b/debian/patches/post-9beta2/0242-rmdec-set-channel-layout-for-RA-version-3.patch
@@ -0,0 +1,32 @@
+From 60a585304c285f44a233a4721238d5ad81697627 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 18:01:27 -0400
+Subject: [PATCH 242/278] rmdec: set channel layout for RA version 3
+
+---
+ libavformat/rmdec.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
+index 07d218e..aff21fb 100644
+--- a/libavformat/rmdec.c
++++ b/libavformat/rmdec.c
+@@ -20,6 +20,7 @@
+  */
+ 
+ #include "libavutil/avstring.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "libavutil/dict.h"
+ #include "avformat.h"
+@@ -140,6 +141,7 @@ static int rm_read_audio_stream_info(AVFormatContext *s, AVIOContext *pb,
+             avio_skip(pb, header_size + startpos - avio_tell(pb));
+         st->codec->sample_rate = 8000;
+         st->codec->channels = 1;
++        st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+         st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+         st->codec->codec_id = AV_CODEC_ID_RA_144;
+         ast->deint_id = DEINT_ID_INT0;
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0243-rsodec-set-channel-layout.patch b/debian/patches/post-9beta2/0243-rsodec-set-channel-layout.patch
new file mode 100644
index 0000000..570c6b2
--- /dev/null
+++ b/debian/patches/post-9beta2/0243-rsodec-set-channel-layout.patch
@@ -0,0 +1,32 @@
+From ce842029ce97ea3eb49854fc71ad288246eb76d1 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 18:18:37 -0400
+Subject: [PATCH 243/278] rsodec: set channel layout
+
+---
+ libavformat/rsodec.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libavformat/rsodec.c b/libavformat/rsodec.c
+index f5bcebb..c3016ca 100644
+--- a/libavformat/rsodec.c
++++ b/libavformat/rsodec.c
+@@ -20,6 +20,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avformat.h"
+ #include "internal.h"
+@@ -63,6 +64,7 @@ static int rso_read_header(AVFormatContext *s)
+     st->codec->codec_tag    = id;
+     st->codec->codec_id     = codec;
+     st->codec->channels     = 1;
++    st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+     st->codec->sample_rate  = rate;
+ 
+     avpriv_set_pts_info(st, 64, 1, rate);
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0244-rtpdec_amr-set-channel-layout.patch b/debian/patches/post-9beta2/0244-rtpdec_amr-set-channel-layout.patch
new file mode 100644
index 0000000..33d1cf2
--- /dev/null
+++ b/debian/patches/post-9beta2/0244-rtpdec_amr-set-channel-layout.patch
@@ -0,0 +1,32 @@
+From c1ac602d53ab250fd1ef37867e18191c55cc5e4f Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 18:24:45 -0400
+Subject: [PATCH 244/278] rtpdec_amr: set channel layout
+
+---
+ libavformat/rtpdec_amr.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libavformat/rtpdec_amr.c b/libavformat/rtpdec_amr.c
+index cc43e31..1e60287 100644
+--- a/libavformat/rtpdec_amr.c
++++ b/libavformat/rtpdec_amr.c
+@@ -19,6 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "avformat.h"
+ #include "rtpdec_formats.h"
+ #include "libavutil/avstring.h"
+@@ -77,6 +78,7 @@ static int amr_handle_packet(AVFormatContext *ctx,
+         av_log(ctx, AV_LOG_ERROR, "Only mono AMR is supported\n");
+         return AVERROR_INVALIDDATA;
+     }
++    st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+ 
+     /* The AMR RTP packet consists of one header byte, followed
+      * by one TOC byte for each AMR frame in the packet, followed
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0245-sierravmd-set-channel-layout.patch b/debian/patches/post-9beta2/0245-sierravmd-set-channel-layout.patch
new file mode 100644
index 0000000..875f9ff
--- /dev/null
+++ b/debian/patches/post-9beta2/0245-sierravmd-set-channel-layout.patch
@@ -0,0 +1,39 @@
+From a634896cf81b8d057a526d6ad24eb9bdfe46a855 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 18:32:13 -0400
+Subject: [PATCH 245/278] sierravmd: set channel layout
+
+---
+ libavformat/sierravmd.c |    9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c
+index 6490fdd..359282c 100644
+--- a/libavformat/sierravmd.c
++++ b/libavformat/sierravmd.c
+@@ -27,6 +27,7 @@
+  *   http://www.pcisys.net/~melanson/codecs/
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avformat.h"
+ #include "internal.h"
+@@ -132,7 +133,13 @@ static int vmd_read_header(AVFormatContext *s)
+         st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+         st->codec->codec_id = AV_CODEC_ID_VMDAUDIO;
+         st->codec->codec_tag = 0;  /* no fourcc */
+-        st->codec->channels = (vmd->vmd_header[811] & 0x80) ? 2 : 1;
++        if (vmd->vmd_header[811] & 0x80) {
++            st->codec->channels       = 2;
++            st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
++        } else {
++            st->codec->channels       = 1;
++            st->codec->channel_layout = AV_CH_LAYOUT_MONO;
++        }
+         st->codec->sample_rate = vmd->sample_rate;
+         st->codec->block_align = AV_RL16(&vmd->vmd_header[806]);
+         if (st->codec->block_align & 0x8000) {
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0246-siff-set-channel-layout.patch b/debian/patches/post-9beta2/0246-siff-set-channel-layout.patch
new file mode 100644
index 0000000..c60aa9b
--- /dev/null
+++ b/debian/patches/post-9beta2/0246-siff-set-channel-layout.patch
@@ -0,0 +1,32 @@
+From 57e590e4b8b94238800b36695f07d5cf4a4832ac Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 18:36:08 -0400
+Subject: [PATCH 246/278] siff: set channel layout
+
+---
+ libavformat/siff.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libavformat/siff.c b/libavformat/siff.c
+index 02af80b..8ba7c60 100644
+--- a/libavformat/siff.c
++++ b/libavformat/siff.c
+@@ -19,6 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avformat.h"
+ #include "internal.h"
+@@ -78,6 +79,7 @@ static int create_audio_stream(AVFormatContext *s, SIFFContext *c)
+     ast->codec->codec_type      = AVMEDIA_TYPE_AUDIO;
+     ast->codec->codec_id        = AV_CODEC_ID_PCM_U8;
+     ast->codec->channels        = 1;
++    ast->codec->channel_layout  = AV_CH_LAYOUT_MONO;
+     ast->codec->bits_per_coded_sample = 8;
+     ast->codec->sample_rate     = c->rate;
+     avpriv_set_pts_info(ast, 16, 1, c->rate);
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0247-smacker-set-channel-layout.patch b/debian/patches/post-9beta2/0247-smacker-set-channel-layout.patch
new file mode 100644
index 0000000..feaf852
--- /dev/null
+++ b/debian/patches/post-9beta2/0247-smacker-set-channel-layout.patch
@@ -0,0 +1,39 @@
+From bfccd76adb514f6bf3dd4bf7f429ca58000f513e Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 18:36:49 -0400
+Subject: [PATCH 247/278] smacker: set channel layout
+
+---
+ libavformat/smacker.c |    9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/libavformat/smacker.c b/libavformat/smacker.c
+index dcca1af..17c7c52 100644
+--- a/libavformat/smacker.c
++++ b/libavformat/smacker.c
+@@ -24,6 +24,7 @@
+  */
+ 
+ #include "libavutil/bswap.h"
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avformat.h"
+ #include "internal.h"
+@@ -191,7 +192,13 @@ static int smacker_read_header(AVFormatContext *s)
+             } else {
+                 ast[i]->codec->codec_id = AV_CODEC_ID_PCM_U8;
+             }
+-            ast[i]->codec->channels = (smk->aflags[i] & SMK_AUD_STEREO) ? 2 : 1;
++            if (smk->aflags[i] & SMK_AUD_STEREO) {
++                ast[i]->codec->channels       = 2;
++                ast[i]->codec->channel_layout = AV_CH_LAYOUT_STEREO;
++            } else {
++                ast[i]->codec->channels       = 1;
++                ast[i]->codec->channel_layout = AV_CH_LAYOUT_MONO;
++            }
+             ast[i]->codec->sample_rate = smk->rates[i];
+             ast[i]->codec->bits_per_coded_sample = (smk->aflags[i] & SMK_AUD_16BITS) ? 16 : 8;
+             if(ast[i]->codec->bits_per_coded_sample == 16 && ast[i]->codec->codec_id == AV_CODEC_ID_PCM_U8)
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0248-sol-set-channel-layout.patch b/debian/patches/post-9beta2/0248-sol-set-channel-layout.patch
new file mode 100644
index 0000000..62861c1
--- /dev/null
+++ b/debian/patches/post-9beta2/0248-sol-set-channel-layout.patch
@@ -0,0 +1,33 @@
+From 1c7587728c81fcb8209ae079a1bc0ccc6b03b4c2 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 18:38:29 -0400
+Subject: [PATCH 248/278] sol: set channel layout
+
+---
+ libavformat/sol.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libavformat/sol.c b/libavformat/sol.c
+index da84600..92599b1 100644
+--- a/libavformat/sol.c
++++ b/libavformat/sol.c
+@@ -23,6 +23,7 @@
+  * Based on documents from Game Audio Player and own research
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avformat.h"
+ #include "internal.h"
+@@ -116,6 +117,8 @@ static int sol_read_header(AVFormatContext *s)
+     st->codec->codec_tag = id;
+     st->codec->codec_id = codec;
+     st->codec->channels = channels;
++    st->codec->channel_layout = channels == 1 ? AV_CH_LAYOUT_MONO :
++                                                AV_CH_LAYOUT_STEREO;
+     st->codec->sample_rate = rate;
+     avpriv_set_pts_info(st, 64, 1, rate);
+     return 0;
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0249-swfdec-set-channel-layout.patch b/debian/patches/post-9beta2/0249-swfdec-set-channel-layout.patch
new file mode 100644
index 0000000..2373784
--- /dev/null
+++ b/debian/patches/post-9beta2/0249-swfdec-set-channel-layout.patch
@@ -0,0 +1,39 @@
+From a3949fe11fc73ef45f87ec045cc2c0a6f19a4052 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 18:42:26 -0400
+Subject: [PATCH 249/278] swfdec: set channel layout
+
+---
+ libavformat/swfdec.c |    9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c
+index ff44452..f105c14 100644
+--- a/libavformat/swfdec.c
++++ b/libavformat/swfdec.c
+@@ -20,6 +20,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "swf.h"
+ 
+@@ -139,7 +140,13 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
+             if (!ast)
+                 return -1;
+             ast->id = -1; /* -1 to avoid clash with video stream ch_id */
+-            ast->codec->channels = 1 + (v&1);
++            if (v & 1) {
++                ast->codec->channels       = 2;
++                ast->codec->channel_layout = AV_CH_LAYOUT_STEREO;
++            } else {
++                ast->codec->channels       = 1;
++                ast->codec->channel_layout = AV_CH_LAYOUT_MONO;
++            }
+             ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+             ast->codec->codec_id = ff_codec_get_id(swf_audio_codec_tags, (v>>4) & 15);
+             ast->need_parsing = AVSTREAM_PARSE_FULL;
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0250-tiertexseq-set-channel-layout.patch b/debian/patches/post-9beta2/0250-tiertexseq-set-channel-layout.patch
new file mode 100644
index 0000000..53e374d
--- /dev/null
+++ b/debian/patches/post-9beta2/0250-tiertexseq-set-channel-layout.patch
@@ -0,0 +1,32 @@
+From 7f348bd764e1ff85054f1da5291f18c0e7f8f39b Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 18:44:20 -0400
+Subject: [PATCH 250/278] tiertexseq: set channel layout
+
+---
+ libavformat/tiertexseq.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libavformat/tiertexseq.c b/libavformat/tiertexseq.c
+index 5582890..45300f9 100644
+--- a/libavformat/tiertexseq.c
++++ b/libavformat/tiertexseq.c
+@@ -24,6 +24,7 @@
+  * Tiertex Limited SEQ file demuxer
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "avformat.h"
+ #include "internal.h"
+ 
+@@ -231,6 +232,7 @@ static int seq_read_header(AVFormatContext *s)
+     st->codec->codec_id = AV_CODEC_ID_PCM_S16BE;
+     st->codec->codec_tag = 0;  /* no tag */
+     st->codec->channels = 1;
++    st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+     st->codec->sample_rate = SEQ_SAMPLE_RATE;
+     st->codec->bits_per_coded_sample = 16;
+     st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_coded_sample * st->codec->channels;
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0251-tmv-set-channel-layout.patch b/debian/patches/post-9beta2/0251-tmv-set-channel-layout.patch
new file mode 100644
index 0000000..4402d1a
--- /dev/null
+++ b/debian/patches/post-9beta2/0251-tmv-set-channel-layout.patch
@@ -0,0 +1,39 @@
+From a94b0267f2e12861b6f78388cdeba29f1240be48 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 18:45:49 -0400
+Subject: [PATCH 251/278] tmv: set channel layout
+
+---
+ libavformat/tmv.c |    9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/libavformat/tmv.c b/libavformat/tmv.c
+index 100e12f..103ac4a 100644
+--- a/libavformat/tmv.c
++++ b/libavformat/tmv.c
+@@ -26,6 +26,7 @@
+  * @see http://www.oldskool.org/pc/8088_Corruption
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avformat.h"
+ #include "internal.h"
+@@ -112,7 +113,13 @@ static int tmv_read_header(AVFormatContext *s)
+ 
+     ast->codec->codec_type            = AVMEDIA_TYPE_AUDIO;
+     ast->codec->codec_id              = AV_CODEC_ID_PCM_U8;
+-    ast->codec->channels              = features & TMV_STEREO ? 2 : 1;
++    if (features & TMV_STEREO) {
++        ast->codec->channels       = 2;
++        ast->codec->channel_layout = AV_CH_LAYOUT_STEREO;
++    } else {
++        ast->codec->channels       = 1;
++        ast->codec->channel_layout = AV_CH_LAYOUT_MONO;
++    }
+     ast->codec->bits_per_coded_sample = 8;
+     ast->codec->bit_rate              = ast->codec->sample_rate *
+                                         ast->codec->bits_per_coded_sample;
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0252-wc3movie-set-channel-layout.patch b/debian/patches/post-9beta2/0252-wc3movie-set-channel-layout.patch
new file mode 100644
index 0000000..ac976cb
--- /dev/null
+++ b/debian/patches/post-9beta2/0252-wc3movie-set-channel-layout.patch
@@ -0,0 +1,32 @@
+From 2ce7f820d46aa268c3f903674c993362f875890d Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 18:49:09 -0400
+Subject: [PATCH 252/278] wc3movie: set channel layout
+
+---
+ libavformat/wc3movie.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libavformat/wc3movie.c b/libavformat/wc3movie.c
+index 117e4ea..c894253 100644
+--- a/libavformat/wc3movie.c
++++ b/libavformat/wc3movie.c
+@@ -27,6 +27,7 @@
+  *   http://www.pcisys.net/~melanson/codecs/
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "libavutil/dict.h"
+ #include "avformat.h"
+@@ -183,6 +184,7 @@ static int wc3_read_header(AVFormatContext *s)
+     st->codec->codec_id = AV_CODEC_ID_PCM_S16LE;
+     st->codec->codec_tag = 1;
+     st->codec->channels = WC3_AUDIO_CHANNELS;
++    st->codec->channel_layout = AV_CH_LAYOUT_MONO;
+     st->codec->bits_per_coded_sample = WC3_AUDIO_BITS;
+     st->codec->sample_rate = WC3_SAMPLE_RATE;
+     st->codec->bit_rate = st->codec->channels * st->codec->sample_rate *
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0253-westwood_aud-set-channel-layout.patch b/debian/patches/post-9beta2/0253-westwood_aud-set-channel-layout.patch
new file mode 100644
index 0000000..1a36806
--- /dev/null
+++ b/debian/patches/post-9beta2/0253-westwood_aud-set-channel-layout.patch
@@ -0,0 +1,33 @@
+From 7b48d93e8abb8736f52548d02ca5d6137d441ba4 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 18:50:41 -0400
+Subject: [PATCH 253/278] westwood_aud: set channel layout
+
+---
+ libavformat/westwood_aud.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libavformat/westwood_aud.c b/libavformat/westwood_aud.c
+index 806aea6..2a06c29 100644
+--- a/libavformat/westwood_aud.c
++++ b/libavformat/westwood_aud.c
+@@ -33,6 +33,7 @@
+  * qualify a file. Refer to wsaud_probe() for the precise parameters.
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avformat.h"
+ #include "internal.h"
+@@ -120,6 +121,8 @@ static int wsaud_read_header(AVFormatContext *s)
+     avpriv_set_pts_info(st, 64, 1, sample_rate);
+     st->codec->codec_type  = AVMEDIA_TYPE_AUDIO;
+     st->codec->channels    = channels;
++    st->codec->channel_layout = channels == 1 ? AV_CH_LAYOUT_MONO :
++                                                AV_CH_LAYOUT_STEREO;
+     st->codec->sample_rate = sample_rate;
+ 
+     return 0;
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0254-wtv-set-channel-layout-for-mpeg-audio.patch b/debian/patches/post-9beta2/0254-wtv-set-channel-layout-for-mpeg-audio.patch
new file mode 100644
index 0000000..461f35e
--- /dev/null
+++ b/debian/patches/post-9beta2/0254-wtv-set-channel-layout-for-mpeg-audio.patch
@@ -0,0 +1,41 @@
+From 935fbb66ef325019ee5a64d1efae69282c68d050 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 18:55:43 -0400
+Subject: [PATCH 254/278] wtv: set channel layout for mpeg audio
+
+---
+ libavformat/wtv.c |   11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/libavformat/wtv.c b/libavformat/wtv.c
+index 57d239e..7bb421b 100644
+--- a/libavformat/wtv.c
++++ b/libavformat/wtv.c
+@@ -25,6 +25,7 @@
+  * @author Peter Ross <pross at xvid.org>
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "libavutil/intfloat.h"
+ #include "libavutil/dict.h"
+@@ -618,8 +619,14 @@ static void parse_mpeg1waveformatex(AVStream *st)
+ 
+     /* dwHeadMode */
+     switch (AV_RL16(st->codec->extradata + 6)) {
+-    case 1 : case 2 : case 4 : st->codec->channels = 2; break;
+-    case 8 :                   st->codec->channels = 1; break;
++    case 1 :
++    case 2 :
++    case 4 : st->codec->channels       = 2;
++             st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
++             break;
++    case 8 : st->codec->channels       = 1;
++             st->codec->channel_layout = AV_CH_LAYOUT_MONO;
++             break;
+     }
+ }
+ 
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0255-yop-set-channel-layout.patch b/debian/patches/post-9beta2/0255-yop-set-channel-layout.patch
new file mode 100644
index 0000000..8929971
--- /dev/null
+++ b/debian/patches/post-9beta2/0255-yop-set-channel-layout.patch
@@ -0,0 +1,32 @@
+From b9629acb6b647b31b8b4e3932e836189bd03e5b9 Mon Sep 17 00:00:00 2001
+From: Justin Ruggles <justin.ruggles at gmail.com>
+Date: Sat, 7 Apr 2012 18:59:00 -0400
+Subject: [PATCH 255/278] yop: set channel layout
+
+---
+ libavformat/yop.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libavformat/yop.c b/libavformat/yop.c
+index 51d088b..351938b 100644
+--- a/libavformat/yop.c
++++ b/libavformat/yop.c
+@@ -22,6 +22,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include "libavutil/channel_layout.h"
+ #include "libavutil/intreadwrite.h"
+ #include "avformat.h"
+ #include "internal.h"
+@@ -74,6 +75,7 @@ static int yop_read_header(AVFormatContext *s)
+     audio_dec->codec_type   = AVMEDIA_TYPE_AUDIO;
+     audio_dec->codec_id     = AV_CODEC_ID_ADPCM_IMA_APC;
+     audio_dec->channels     = 1;
++    audio_dec->channels     = AV_CH_LAYOUT_MONO;
+     audio_dec->sample_rate  = 22050;
+ 
+     // Video
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0256-hlsenc-stand-alone-hls-segmenter.patch b/debian/patches/post-9beta2/0256-hlsenc-stand-alone-hls-segmenter.patch
new file mode 100644
index 0000000..15f7d68
--- /dev/null
+++ b/debian/patches/post-9beta2/0256-hlsenc-stand-alone-hls-segmenter.patch
@@ -0,0 +1,404 @@
+From 22a0827dff29a94e7fd07ad2782f169b2703c70d Mon Sep 17 00:00:00 2001
+From: Luca Barbato <lu_zero at gentoo.org>
+Date: Fri, 26 Oct 2012 16:36:56 +0200
+Subject: [PATCH 256/278] hlsenc: stand alone hls segmenter
+
+Simplifies usage but has higher latency.
+---
+ doc/muxers.texi          |   21 +++
+ libavformat/Makefile     |    1 +
+ libavformat/allformats.c |    2 +-
+ libavformat/hlsenc.c     |  324 ++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 347 insertions(+), 1 deletion(-)
+ create mode 100644 libavformat/hlsenc.c
+
+diff --git a/doc/muxers.texi b/doc/muxers.texi
+index 4bb6d56..570041d 100644
+--- a/doc/muxers.texi
++++ b/doc/muxers.texi
+@@ -90,6 +90,27 @@ avconv -i INPUT -c:a pcm_u8 -c:v mpeg2video -f framecrc -
+ 
+ See also the @ref{crc} muxer.
+ 
++ at anchor{hls}
++ at section hls
++
++Apple HTTP Live Streaming muxer that segments MPEG-TS according to
++the HTTP Live Streaming specification.
++
++It creates a playlist file and numbered segment files. The output
++filename specifies the playlist filename; the segment filenames
++receive the same basename as the playlist, a sequential number and
++a .ts extension.
++
++ at example
++avconv -i in.nut out.m3u8
++ at end example
++
++ at table @option
++ at item -hls_time segment length in seconds
++ at item -hls_list_size maximum number of playlist entries
++ at item -hls_wrap number after which index wraps
++ at end table
++
+ @anchor{image2}
+ @section image2
+ 
+diff --git a/libavformat/Makefile b/libavformat/Makefile
+index ed030bd..c589316 100644
+--- a/libavformat/Makefile
++++ b/libavformat/Makefile
+@@ -111,6 +111,7 @@ OBJS-$(CONFIG_H263_MUXER)                += rawenc.o
+ OBJS-$(CONFIG_H264_DEMUXER)              += h264dec.o rawdec.o
+ OBJS-$(CONFIG_H264_MUXER)                += rawenc.o
+ OBJS-$(CONFIG_HLS_DEMUXER)               += hls.o
++OBJS-$(CONFIG_HLS_MUXER)                 += hlsenc.o mpegtsenc.o
+ OBJS-$(CONFIG_IDCIN_DEMUXER)             += idcin.o
+ OBJS-$(CONFIG_IFF_DEMUXER)               += iff.o
+ OBJS-$(CONFIG_ILBC_DEMUXER)              += ilbc.o
+diff --git a/libavformat/allformats.c b/libavformat/allformats.c
+index 39daec7..c7c4be9 100644
+--- a/libavformat/allformats.c
++++ b/libavformat/allformats.c
+@@ -106,7 +106,7 @@ void av_register_all(void)
+     REGISTER_MUXDEMUX (H261, h261);
+     REGISTER_MUXDEMUX (H263, h263);
+     REGISTER_MUXDEMUX (H264, h264);
+-    REGISTER_DEMUXER  (HLS, hls);
++    REGISTER_MUXDEMUX (HLS, hls);
+     REGISTER_DEMUXER  (IDCIN, idcin);
+     REGISTER_DEMUXER  (IFF, iff);
+     REGISTER_MUXDEMUX (ILBC, ilbc);
+diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
+new file mode 100644
+index 0000000..88f47e0
+--- /dev/null
++++ b/libavformat/hlsenc.c
+@@ -0,0 +1,324 @@
++/*
++ * Apple HTTP Live Streaming segmenter
++ * Copyright (c) 2012, Luca Barbato
++ *
++ * This file is part of Libav.
++ *
++ * Libav is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * Libav is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with Libav; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++#include <float.h>
++
++#include "libavutil/mathematics.h"
++#include "libavutil/parseutils.h"
++#include "libavutil/avstring.h"
++#include "libavutil/opt.h"
++#include "libavutil/log.h"
++
++#include "avformat.h"
++#include "internal.h"
++
++typedef struct ListEntry {
++    char  name[1024];
++    int   duration;
++    struct ListEntry *next;
++} ListEntry;
++
++typedef struct HLSContext {
++    const AVClass *class;  // Class for private options.
++    int number;
++    AVOutputFormat *oformat;
++    AVFormatContext *avf;
++    float time;            // Set by a private option.
++    int  size;             // Set by a private option.
++    int  wrap;             // Set by a private option.
++    int64_t recording_time;
++    int has_video;
++    int64_t start_pts;
++    int64_t end_pts;
++    ListEntry *list;
++    ListEntry *end_list;
++    char *basename;
++    AVIOContext *pb;
++} HLSContext;
++
++static int hls_mux_init(AVFormatContext *s)
++{
++    HLSContext *hls = s->priv_data;
++    AVFormatContext *oc;
++    int i;
++
++    hls->avf = oc = avformat_alloc_context();
++    if (!oc)
++        return AVERROR(ENOMEM);
++
++    oc->oformat            = hls->oformat;
++    oc->interrupt_callback = s->interrupt_callback;
++
++    for (i = 0; i < s->nb_streams; i++) {
++        AVStream *st;
++        if (!(st = avformat_new_stream(oc, NULL)))
++            return AVERROR(ENOMEM);
++        avcodec_copy_context(st->codec, s->streams[i]->codec);
++        st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio;
++    }
++
++    return 0;
++}
++
++static int append_entry(HLSContext *hls, uint64_t duration)
++{
++    ListEntry *en = av_malloc(sizeof(*en));
++
++    if (!en)
++        return AVERROR(ENOMEM);
++
++    av_get_frame_filename(en->name, sizeof(en->name), hls->basename,
++                          hls->number -1);
++
++    en->duration = duration;
++    en->next     = NULL;
++
++    if (!hls->list)
++        hls->list = en;
++    else
++        hls->end_list->next = en;
++
++    hls->end_list = en;
++
++    if (hls->number >= hls->size) {
++        en = hls->list;
++        hls->list = en->next;
++        av_free(en);
++    }
++
++    return 0;
++}
++
++static void free_entries(HLSContext *hls)
++{
++    ListEntry *p = hls->list, *en;
++
++    while(p) {
++        en = p;
++        p = p->next;
++        av_free(en);
++    }
++}
++
++static int hls_window(AVFormatContext *s, int last)
++{
++    HLSContext *hls = s->priv_data;
++    ListEntry *en;
++    int ret = 0;
++
++    if ((ret = avio_open2(&hls->pb, s->filename, AVIO_FLAG_WRITE,
++                          &s->interrupt_callback, NULL)) < 0)
++        goto fail;
++
++    avio_printf(hls->pb, "#EXTM3U\n");
++    avio_printf(hls->pb, "#EXT-X-VERSION:3\n");
++    avio_printf(hls->pb, "#EXT-X-TARGETDURATION:%d\n", (int)hls->time);
++    avio_printf(hls->pb, "#EXT-X-MEDIA-SEQUENCE:%d\n",
++                FFMAX(0, hls->number - hls->size));
++
++    for (en = hls->list; en; en = en->next) {
++        avio_printf(hls->pb, "#EXTINF:%d,\n", en->duration);
++        avio_printf(hls->pb, "%s\n", en->name);
++    }
++
++    if (last)
++        avio_printf(hls->pb, "#EXT-X-ENDLIST\n");
++
++fail:
++    avio_closep(&hls->pb);
++    return ret;
++}
++
++static int hls_start(AVFormatContext *s)
++{
++    HLSContext *c = s->priv_data;
++    AVFormatContext *oc = c->avf;
++    int err = 0;
++
++    if (c->wrap)
++        c->number %= c->wrap;
++
++    if (av_get_frame_filename(oc->filename, sizeof(oc->filename),
++                              c->basename, c->number++) < 0)
++        return AVERROR(EINVAL);
++
++    if ((err = avio_open2(&oc->pb, oc->filename, AVIO_FLAG_WRITE,
++                          &s->interrupt_callback, NULL)) < 0)
++        return err;
++
++    if (oc->oformat->priv_class && oc->priv_data)
++        av_opt_set(oc->priv_data, "mpegts_flags", "resend_headers", 0);
++
++    return 0;
++}
++
++static int hls_write_header(AVFormatContext *s)
++{
++    HLSContext *hls = s->priv_data;
++    int ret, i;
++    char *p;
++    const char *pattern = "%d.ts";
++    int basename_size = strlen(s->filename) + strlen(pattern);
++
++    hls->number      = 0;
++
++    hls->recording_time = hls->time * 1000000;
++    hls->start_pts      = AV_NOPTS_VALUE;
++
++    for (i = 0; i < s->nb_streams; i++)
++        hls->has_video +=
++            s->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO;
++
++    if (hls->has_video > 1)
++        av_log(s, AV_LOG_WARNING,
++               "More than a single video stream present, "
++               "expect issues decoding it.\n");
++
++    hls->oformat = av_guess_format("mpegts", NULL, NULL);
++
++    if (!hls->oformat) {
++        ret = AVERROR_MUXER_NOT_FOUND;
++        goto fail;
++    }
++
++    hls->basename = av_malloc(basename_size);
++
++    if (!hls->basename) {
++        ret = AVERROR(ENOMEM);
++        goto fail;
++    }
++
++    strcpy(hls->basename, s->filename);
++
++    p = strrchr(hls->basename, '.');
++
++    if (p)
++        *p = '\0';
++
++    av_strlcat(hls->basename, "%d.ts", basename_size);
++
++    if ((ret = hls_mux_init(s)) < 0)
++        goto fail;
++
++    if ((ret = hls_start(s)) < 0)
++        goto fail;
++
++    if ((ret = avformat_write_header(hls->avf, NULL)) < 0)
++        return ret;
++
++
++fail:
++    if (ret) {
++        av_free(hls->basename);
++        if (hls->avf)
++            avformat_free_context(hls->avf);
++    }
++    return ret;
++}
++
++static int hls_write_packet(AVFormatContext *s, AVPacket *pkt)
++{
++    HLSContext *hls = s->priv_data;
++    AVFormatContext *oc = hls->avf;
++    AVStream *st = s->streams[pkt->stream_index];
++    int64_t end_pts = hls->recording_time * hls->number;
++    int ret;
++
++    if (hls->start_pts == AV_NOPTS_VALUE) {
++        hls->start_pts = pkt->pts;
++        hls->end_pts   = pkt->pts;
++    }
++    end_pts += hls->start_pts;
++
++    if ((hls->has_video && st->codec->codec_type == AVMEDIA_TYPE_VIDEO)      &&
++        av_compare_ts(pkt->pts, st->time_base, end_pts, AV_TIME_BASE_Q) >= 0 &&
++        pkt->flags & AV_PKT_FLAG_KEY) {
++
++        append_entry(hls, av_rescale(pkt->pts - hls->end_pts,
++                                     st->time_base.num,
++                                     st->time_base.den));
++        hls->end_pts = pkt->pts;
++
++        av_write_frame(oc, NULL); /* Flush any buffered data */
++        avio_close(oc->pb);
++
++        ret = hls_start(s);
++
++        if (ret)
++            return ret;
++
++        oc = hls->avf;
++
++        if ((ret = hls_window(s, 0)) < 0)
++            return ret;
++    }
++
++    ret = ff_write_chained(oc, pkt->stream_index, pkt, s);
++
++    return ret;
++}
++
++static int hls_write_trailer(struct AVFormatContext *s)
++{
++    HLSContext *hls = s->priv_data;
++    AVFormatContext *oc = hls->avf;
++
++    av_write_trailer(oc);
++    avio_closep(&oc->pb);
++    avformat_free_context(oc);
++    av_free(hls->basename);
++    hls_window(s, 1);
++
++    free_entries(hls);
++    avio_close(hls->pb);
++    return 0;
++}
++
++#define OFFSET(x) offsetof(HLSContext, x)
++#define E AV_OPT_FLAG_ENCODING_PARAM
++static const AVOption options[] = {
++    {"hls_time",      "segment length in seconds",               OFFSET(time),    AV_OPT_TYPE_FLOAT,  {.dbl = 2},     0, FLT_MAX, E},
++    {"hls_list_size", "maximum number of playlist entries",      OFFSET(size),    AV_OPT_TYPE_INT,    {.i64 = 5},     0, INT_MAX, E},
++    {"hls_wrap",      "number after which the index wraps",      OFFSET(wrap),    AV_OPT_TYPE_INT,    {.i64 = 0},     0, INT_MAX, E},
++    { NULL },
++};
++
++static const AVClass hls_class = {
++    .class_name = "hls muxer",
++    .item_name  = av_default_item_name,
++    .option     = options,
++    .version    = LIBAVUTIL_VERSION_INT,
++};
++
++
++AVOutputFormat ff_hls_muxer = {
++    .name           = "hls",
++    .long_name      = NULL_IF_CONFIG_SMALL("hls"),
++    .extensions     = "m3u8",
++    .priv_data_size = sizeof(HLSContext),
++    .audio_codec    = AV_CODEC_ID_MP2,
++    .video_codec    = AV_CODEC_ID_MPEG2VIDEO,
++    .flags          = AVFMT_NOFILE | AVFMT_ALLOW_FLUSH,
++    .write_header   = hls_write_header,
++    .write_packet   = hls_write_packet,
++    .write_trailer  = hls_write_trailer,
++    .priv_class     = &hls_class,
++};
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0257-pixdesc-add-av_pix_fmt_get_chroma_sub_sample.patch b/debian/patches/post-9beta2/0257-pixdesc-add-av_pix_fmt_get_chroma_sub_sample.patch
new file mode 100644
index 0000000..0a8d61e
--- /dev/null
+++ b/debian/patches/post-9beta2/0257-pixdesc-add-av_pix_fmt_get_chroma_sub_sample.patch
@@ -0,0 +1,232 @@
+From c1a02e884ac785033baab356a5437adf057a4189 Mon Sep 17 00:00:00 2001
+From: Luca Barbato <lu_zero at gentoo.org>
+Date: Mon, 12 Nov 2012 01:25:43 +0100
+Subject: [PATCH 257/278] pixdesc: add av_pix_fmt_get_chroma_sub_sample
+
+Deprecate avcodec_get_chroma_sub_sample.
+---
+ cmdutils.c                 |    4 +++-
+ libavcodec/avcodec.h       |    6 +++++-
+ libavcodec/ffv1enc.c       |    4 ++--
+ libavcodec/libtheoraenc.c  |    3 ++-
+ libavcodec/mpegvideo.c     |    9 +++++----
+ libavcodec/mpegvideo_enc.c |   10 ++++++----
+ libavcodec/tiffenc.c       |    4 ++--
+ libavcodec/utils.c         |    3 ++-
+ libavcodec/vp3.c           |    3 ++-
+ libavutil/pixdesc.c        |   12 ++++++++++++
+ libavutil/pixdesc.h        |   14 ++++++++++++++
+ 11 files changed, 55 insertions(+), 17 deletions(-)
+
+diff --git a/cmdutils.c b/cmdutils.c
+index 630301f..2329120 100644
+--- a/cmdutils.c
++++ b/cmdutils.c
+@@ -1322,7 +1322,9 @@ static int alloc_buffer(FrameBuffer **pool, AVCodecContext *s, FrameBuffer **pbu
+      */
+     memset(buf->base[0], 128, ret);
+ 
+-    avcodec_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift, &v_chroma_shift);
++    av_pix_fmt_get_chroma_sub_sample(s->pix_fmt,
++                                     &h_chroma_shift, &v_chroma_shift);
++
+     for (i = 0; i < FF_ARRAY_ELEMS(buf->data); i++) {
+         const int h_shift = i==0 ? 0 : h_chroma_shift;
+         const int v_shift = i==0 ? 0 : v_chroma_shift;
+diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
+index d5968f9..58ea1bc 100644
+--- a/libavcodec/avcodec.h
++++ b/libavcodec/avcodec.h
+@@ -4285,7 +4285,11 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width,
+  * @{
+  */
+ 
+-void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift);
++/**
++ * @deprecated Use av_pix_fmt_get_chroma_sub_sample
++ */
++
++void attribute_deprecated avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift);
+ 
+ /**
+  * Return a value representing the fourCC code associated to the
+diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
+index efc1b11..8c6fc9a 100644
+--- a/libavcodec/ffv1enc.c
++++ b/libavcodec/ffv1enc.c
+@@ -725,8 +725,8 @@ static av_cold int ffv1_encode_init(AVCodecContext *avctx)
+     if (!s->transparency)
+         s->plane_count = 2;
+ 
+-    avcodec_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_h_shift,
+-                                  &s->chroma_v_shift);
++    av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_h_shift,
++                                     &s->chroma_v_shift);
+ 
+     s->picture_number = 0;
+ 
+diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c
+index 6c4eddf..469c6fd 100644
+--- a/libavcodec/libtheoraenc.c
++++ b/libavcodec/libtheoraenc.c
+@@ -197,7 +197,8 @@ static av_cold int encode_init(AVCodecContext* avc_context)
+         av_log(avc_context, AV_LOG_ERROR, "Unsupported pix_fmt\n");
+         return -1;
+     }
+-    avcodec_get_chroma_sub_sample(avc_context->pix_fmt, &h->uv_hshift, &h->uv_vshift);
++    av_pix_fmt_get_chroma_sub_sample(avc_context->pix_fmt,
++                                     &h->uv_hshift, &h->uv_vshift);
+ 
+     if (avc_context->flags & CODEC_FLAG_QSCALE) {
+         /* to be constant with the libvorbis implementation, clip global_quality to 0 - 10
+diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
+index af9e040..8a48d99 100644
+--- a/libavcodec/mpegvideo.c
++++ b/libavcodec/mpegvideo.c
+@@ -867,8 +867,9 @@ av_cold int ff_MPV_common_init(MpegEncContext *s)
+ 
+     if (s->width && s->height) {
+         /* set chroma shifts */
+-        avcodec_get_chroma_sub_sample(s->avctx->pix_fmt, &s->chroma_x_shift,
+-                                      &s->chroma_y_shift);
++        av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt,
++                                         &s->chroma_x_shift,
++                                         &s->chroma_y_shift);
+ 
+         /* convert fourcc to upper case */
+         s->codec_tag          = avpriv_toupper4(s->avctx->codec_tag);
+@@ -1781,8 +1782,8 @@ void ff_print_debug_info(MpegEncContext *s, AVFrame *pict)
+                                    (s->codec_id == AV_CODEC_ID_H264 ? 0 : 1);
+         s->low_delay = 0; // needed to see the vectors without trashing the buffers
+ 
+-        avcodec_get_chroma_sub_sample(s->avctx->pix_fmt,
+-                                      &h_chroma_shift, &v_chroma_shift);
++        av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt,
++                                         &h_chroma_shift, &v_chroma_shift);
+         for (i = 0; i < 3; i++) {
+             memcpy(s->visualization_buffer[i], pict->data[i],
+                    (i == 0) ? pict->linesize[i] * height:
+diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
+index d2719fe..7c92ad2 100644
+--- a/libavcodec/mpegvideo_enc.c
++++ b/libavcodec/mpegvideo_enc.c
+@@ -29,6 +29,7 @@
+ 
+ #include "libavutil/intmath.h"
+ #include "libavutil/mathematics.h"
++#include "libavutil/pixdesc.h"
+ #include "libavutil/opt.h"
+ #include "avcodec.h"
+ #include "dsputil.h"
+@@ -601,8 +602,8 @@ av_cold int ff_MPV_encode_init(AVCodecContext *avctx)
+     if (avctx->inter_quant_bias != FF_DEFAULT_QUANT_BIAS)
+         s->inter_quant_bias = avctx->inter_quant_bias;
+ 
+-    avcodec_get_chroma_sub_sample(avctx->pix_fmt, &chroma_h_shift,
+-                                  &chroma_v_shift);
++    av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &chroma_h_shift,
++                                     &chroma_v_shift);
+ 
+     if (avctx->codec_id == AV_CODEC_ID_MPEG4 &&
+         s->avctx->time_base.den > (1 << 16) - 1) {
+@@ -994,8 +995,9 @@ static int load_input_picture(MpegEncContext *s, AVFrame *pic_arg)
+             // empty
+         } else {
+             int h_chroma_shift, v_chroma_shift;
+-            avcodec_get_chroma_sub_sample(s->avctx->pix_fmt, &h_chroma_shift,
+-                                          &v_chroma_shift);
++            av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt,
++                                             &h_chroma_shift,
++                                             &v_chroma_shift);
+ 
+             for (i = 0; i < 3; i++) {
+                 int src_stride = pic_arg->linesize[i];
+diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c
+index 9811404..8162c40 100644
+--- a/libavcodec/tiffenc.c
++++ b/libavcodec/tiffenc.c
+@@ -270,8 +270,8 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
+     case AV_PIX_FMT_YUV410P:
+     case AV_PIX_FMT_YUV411P:
+         s->photometric_interpretation = 6;
+-        avcodec_get_chroma_sub_sample(avctx->pix_fmt,
+-                &shift_h, &shift_v);
++        av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt,
++                                         &shift_h, &shift_v);
+         s->bpp = 8 + (16 >> (shift_h + shift_v));
+         s->subsampling[0] = 1 << shift_h;
+         s->subsampling[1] = 1 << shift_v;
+diff --git a/libavcodec/utils.c b/libavcodec/utils.c
+index 8c203b9..054dc69 100644
+--- a/libavcodec/utils.c
++++ b/libavcodec/utils.c
+@@ -427,7 +427,8 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic)
+         const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(s->pix_fmt);
+         const int pixel_size = desc->comp[0].step_minus1 + 1;
+ 
+-        avcodec_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift, &v_chroma_shift);
++        av_pix_fmt_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift,
++                                         &v_chroma_shift);
+ 
+         avcodec_align_dimensions2(s, &w, &h, stride_align);
+ 
+diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
+index 90532cb..e812759 100644
+--- a/libavcodec/vp3.c
++++ b/libavcodec/vp3.c
+@@ -1687,7 +1687,8 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx)
+     for (i = 0; i < 3; i++)
+         s->qps[i] = -1;
+ 
+-    avcodec_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_x_shift, &s->chroma_y_shift);
++    av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_x_shift,
++                                     &s->chroma_y_shift);
+ 
+     s->y_superblock_width = (s->width + 31) / 32;
+     s->y_superblock_height = (s->height + 31) / 32;
+diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
+index bc446b1..d0889b4 100644
+--- a/libavutil/pixdesc.c
++++ b/libavutil/pixdesc.c
+@@ -1454,3 +1454,15 @@ enum AVPixelFormat av_pix_fmt_desc_get_id(const AVPixFmtDescriptor *desc)
+ 
+     return desc - av_pix_fmt_descriptors;
+ }
++
++int av_pix_fmt_get_chroma_sub_sample(enum AVPixelFormat pix_fmt,
++                                     int *h_shift, int *v_shift)
++{
++    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
++    if (!desc)
++        return AVERROR(ENOSYS);
++    *h_shift = desc->log2_chroma_w;
++    *v_shift = desc->log2_chroma_h;
++
++    return 0;
++}
+diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h
+index 7da17bc..a944c66 100644
+--- a/libavutil/pixdesc.h
++++ b/libavutil/pixdesc.h
+@@ -203,4 +203,18 @@ const AVPixFmtDescriptor *av_pix_fmt_desc_next(const AVPixFmtDescriptor *prev);
+  */
+ enum AVPixelFormat av_pix_fmt_desc_get_id(const AVPixFmtDescriptor *desc);
+ 
++/**
++ * Utility function to access log2_chroma_w log2_chroma_h from
++ * the pixel format AVPixFmtDescriptor.
++ *
++ * @param[in]  pix_fmt the pixel format
++ * @param[out] h_shift store log2_chroma_h
++ * @param[out] v_shift store log2_chroma_w
++ *
++ * @return 0 on success, AVERROR(ENOSYS) on invalid or unknown pixel format
++ */
++int av_pix_fmt_get_chroma_sub_sample(enum AVPixelFormat pix_fmt,
++                                     int *h_shift, int *v_shift);
++
++
+ #endif /* AVUTIL_PIXDESC_H */
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0258-avcodec-remove-ff_is_hwaccel_pix_fmt.patch b/debian/patches/post-9beta2/0258-avcodec-remove-ff_is_hwaccel_pix_fmt.patch
new file mode 100644
index 0000000..be57224
--- /dev/null
+++ b/debian/patches/post-9beta2/0258-avcodec-remove-ff_is_hwaccel_pix_fmt.patch
@@ -0,0 +1,70 @@
+From cc085993f42cc01f394c2ce867397179bdf17cca Mon Sep 17 00:00:00 2001
+From: Luca Barbato <lu_zero at gentoo.org>
+Date: Mon, 12 Nov 2012 01:25:44 +0100
+Subject: [PATCH 258/278] avcodec: remove ff_is_hwaccel_pix_fmt
+
+It is used only in one place and is unlikely it would be needed
+elsewhere.
+---
+ libavcodec/imgconvert.c |    6 ------
+ libavcodec/internal.h   |    5 -----
+ libavcodec/utils.c      |    8 +++++++-
+ 3 files changed, 7 insertions(+), 12 deletions(-)
+
+diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
+index fd30dc4..dacf3c4 100644
+--- a/libavcodec/imgconvert.c
++++ b/libavcodec/imgconvert.c
+@@ -415,12 +415,6 @@ void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int
+     *v_shift = desc->log2_chroma_h;
+ }
+ 
+-int ff_is_hwaccel_pix_fmt(enum AVPixelFormat pix_fmt)
+-{
+-    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
+-    return desc->flags & PIX_FMT_HWACCEL;
+-}
+-
+ int avpicture_fill(AVPicture *picture, uint8_t *ptr,
+                    enum AVPixelFormat pix_fmt, int width, int height)
+ {
+diff --git a/libavcodec/internal.h b/libavcodec/internal.h
+index 231d4b6..0f624e2 100644
+--- a/libavcodec/internal.h
++++ b/libavcodec/internal.h
+@@ -86,11 +86,6 @@ struct AVCodecDefault {
+ };
+ 
+ /**
+- * Determine whether pix_fmt is a hardware accelerated format.
+- */
+-int ff_is_hwaccel_pix_fmt(enum AVPixelFormat pix_fmt);
+-
+-/**
+  * Return the hardware accelerated codec for codec codec_id and
+  * pixel format pix_fmt.
+  *
+diff --git a/libavcodec/utils.c b/libavcodec/utils.c
+index 054dc69..06f4fc9 100644
+--- a/libavcodec/utils.c
++++ b/libavcodec/utils.c
+@@ -628,9 +628,15 @@ int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2,
+     return 0;
+ }
+ 
++static int is_hwaccel_pix_fmt(enum AVPixelFormat pix_fmt)
++{
++    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
++    return desc->flags & PIX_FMT_HWACCEL;
++}
++
+ enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat *fmt)
+ {
+-    while (*fmt != AV_PIX_FMT_NONE && ff_is_hwaccel_pix_fmt(*fmt))
++    while (*fmt != AV_PIX_FMT_NONE && is_hwaccel_pix_fmt(*fmt))
+         ++fmt;
+     return fmt[0];
+ }
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0259-libtheoraenc-add-missing-pixdesc.h-header.patch b/debian/patches/post-9beta2/0259-libtheoraenc-add-missing-pixdesc.h-header.patch
new file mode 100644
index 0000000..78e1078
--- /dev/null
+++ b/debian/patches/post-9beta2/0259-libtheoraenc-add-missing-pixdesc.h-header.patch
@@ -0,0 +1,25 @@
+From 83f9ed42ec696cedd7b84f255968a5888f749fc9 Mon Sep 17 00:00:00 2001
+From: Luca Barbato <lu_zero at gentoo.org>
+Date: Tue, 13 Nov 2012 17:42:13 +0100
+Subject: [PATCH 259/278] libtheoraenc: add missing pixdesc.h header
+
+Was left out from c1a02e884ac785033baab356a5437adf057a4189.
+---
+ libavcodec/libtheoraenc.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c
+index 469c6fd..e57310a 100644
+--- a/libavcodec/libtheoraenc.c
++++ b/libavcodec/libtheoraenc.c
+@@ -33,6 +33,7 @@
+ /* Libav includes */
+ #include "libavutil/common.h"
+ #include "libavutil/intreadwrite.h"
++#include "libavutil/pixdesc.h"
+ #include "libavutil/log.h"
+ #include "libavutil/base64.h"
+ #include "avcodec.h"
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0260-x86-h264_weight_10bit-port-to-cpuflags.patch b/debian/patches/post-9beta2/0260-x86-h264_weight_10bit-port-to-cpuflags.patch
new file mode 100644
index 0000000..4850d7e
--- /dev/null
+++ b/debian/patches/post-9beta2/0260-x86-h264_weight_10bit-port-to-cpuflags.patch
@@ -0,0 +1,282 @@
+From 5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2 Mon Sep 17 00:00:00 2001
+From: Diego Biurrun <diego at biurrun.de>
+Date: Sun, 15 Jul 2012 15:44:39 +0200
+Subject: [PATCH 260/278] x86: h264_weight_10bit: port to cpuflags
+
+---
+ libavcodec/x86/h264_weight_10bit.asm |  132 ++++++++++++++++++----------------
+ 1 file changed, 69 insertions(+), 63 deletions(-)
+
+diff --git a/libavcodec/x86/h264_weight_10bit.asm b/libavcodec/x86/h264_weight_10bit.asm
+index 20d26a4..3b09e42 100644
+--- a/libavcodec/x86/h264_weight_10bit.asm
++++ b/libavcodec/x86/h264_weight_10bit.asm
+@@ -48,7 +48,7 @@ SECTION .text
+     movifnidn r5d, r5m
+ %endmacro
+ 
+-%macro WEIGHT_SETUP 1
++%macro WEIGHT_SETUP 0
+     mova       m0, [pw_1]
+     movd       m2, r3m
+     pslld      m0, m2       ; 1<<log2_denom
+@@ -59,19 +59,19 @@ SECTION .text
+     pshufd     m3, m3, 0
+     mova       m4, [pw_pixel_max]
+     paddw      m2, [sq_1]   ; log2_denom+1
+-%ifnidn %1, sse4
++%if notcpuflag(sse4)
+     pxor       m7, m7
+ %endif
+ %endmacro
+ 
+-%macro WEIGHT_OP 2-3
+-%if %0==2
+-    mova        m5, [r0+%2]
++%macro WEIGHT_OP 1-2
++%if %0==1
++    mova        m5, [r0+%1]
+     punpckhwd   m6, m5, m0
+     punpcklwd   m5, m0
+ %else
+-    movq        m5, [r0+%2]
+-    movq        m6, [r0+%3]
++    movq        m5, [r0+%1]
++    movq        m6, [r0+%2]
+     punpcklwd   m5, m0
+     punpcklwd   m6, m0
+ %endif
+@@ -79,7 +79,7 @@ SECTION .text
+     pmaddwd     m6, m3
+     psrad       m5, m2
+     psrad       m6, m2
+-%ifidn %1, sse4
++%if cpuflag(sse4)
+     packusdw    m5, m6
+     pminsw      m5, m4
+ %else
+@@ -88,14 +88,14 @@ SECTION .text
+ %endif
+ %endmacro
+ 
+-%macro WEIGHT_FUNC_DBL 1
+-cglobal h264_weight_16_10_%1
++%macro WEIGHT_FUNC_DBL 0
++cglobal h264_weight_16_10
+     WEIGHT_PROLOGUE
+-    WEIGHT_SETUP %1
++    WEIGHT_SETUP
+ .nextrow:
+-    WEIGHT_OP %1,  0
++    WEIGHT_OP  0
+     mova [r0   ], m5
+-    WEIGHT_OP %1, 16
++    WEIGHT_OP 16
+     mova [r0+16], m5
+     add       r0, r1
+     dec       r2d
+@@ -103,17 +103,18 @@ cglobal h264_weight_16_10_%1
+     REP_RET
+ %endmacro
+ 
+-INIT_XMM
+-WEIGHT_FUNC_DBL sse2
+-WEIGHT_FUNC_DBL sse4
++INIT_XMM sse2
++WEIGHT_FUNC_DBL
++INIT_XMM sse4
++WEIGHT_FUNC_DBL
+ 
+ 
+-%macro WEIGHT_FUNC_MM 1
+-cglobal h264_weight_8_10_%1
++%macro WEIGHT_FUNC_MM 0
++cglobal h264_weight_8_10
+     WEIGHT_PROLOGUE
+-    WEIGHT_SETUP %1
++    WEIGHT_SETUP
+ .nextrow:
+-    WEIGHT_OP  %1, 0
++    WEIGHT_OP   0
+     mova     [r0], m5
+     add        r0, r1
+     dec        r2d
+@@ -121,19 +122,20 @@ cglobal h264_weight_8_10_%1
+     REP_RET
+ %endmacro
+ 
+-INIT_XMM
+-WEIGHT_FUNC_MM sse2
+-WEIGHT_FUNC_MM sse4
++INIT_XMM sse2
++WEIGHT_FUNC_MM
++INIT_XMM sse4
++WEIGHT_FUNC_MM
+ 
+ 
+-%macro WEIGHT_FUNC_HALF_MM 1
+-cglobal h264_weight_4_10_%1
++%macro WEIGHT_FUNC_HALF_MM 0
++cglobal h264_weight_4_10
+     WEIGHT_PROLOGUE
+     sar         r2d, 1
+-    WEIGHT_SETUP %1
++    WEIGHT_SETUP
+     lea         r3, [r1*2]
+ .nextrow:
+-    WEIGHT_OP   %1, 0, r1
++    WEIGHT_OP    0, r1
+     movh      [r0], m5
+     movhps [r0+r1], m5
+     add         r0, r3
+@@ -142,9 +144,10 @@ cglobal h264_weight_4_10_%1
+     REP_RET
+ %endmacro
+ 
+-INIT_XMM
+-WEIGHT_FUNC_HALF_MM sse2
+-WEIGHT_FUNC_HALF_MM sse4
++INIT_XMM sse2
++WEIGHT_FUNC_HALF_MM
++INIT_XMM sse4
++WEIGHT_FUNC_HALF_MM
+ 
+ 
+ ;-----------------------------------------------------------------------------
+@@ -168,7 +171,7 @@ DECLARE_REG_TMP 7
+     movifnidn t0d, r7m
+ %endmacro
+ 
+-%macro BIWEIGHT_SETUP 1
++%macro BIWEIGHT_SETUP 0
+     lea        t0, [t0*4+1] ; (offset<<2)+1
+     or         t0, 1
+     shl        r6, 16
+@@ -182,23 +185,23 @@ DECLARE_REG_TMP 7
+     pshufd     m5, m5, 0
+     mova       m3, [pw_pixel_max]
+     movifnidn r3d, r3m
+-%ifnidn %1, sse4
++%if notcpuflag(sse4)
+     pxor       m7, m7
+ %endif
+ %endmacro
+ 
+-%macro BIWEIGHT 2-3
+-%if %0==2
+-    mova       m0, [r0+%2]
+-    mova       m1, [r1+%2]
++%macro BIWEIGHT 1-2
++%if %0==1
++    mova       m0, [r0+%1]
++    mova       m1, [r1+%1]
+     punpckhwd  m2, m0, m1
+     punpcklwd  m0, m1
+ %else
+-    movq       m0, [r0+%2]
+-    movq       m1, [r1+%2]
++    movq       m0, [r0+%1]
++    movq       m1, [r1+%1]
+     punpcklwd  m0, m1
+-    movq       m2, [r0+%3]
+-    movq       m1, [r1+%3]
++    movq       m2, [r0+%2]
++    movq       m1, [r1+%2]
+     punpcklwd  m2, m1
+ %endif
+     pmaddwd    m0, m4
+@@ -207,7 +210,7 @@ DECLARE_REG_TMP 7
+     paddd      m2, m5
+     psrad      m0, m6
+     psrad      m2, m6
+-%ifidn %1, sse4
++%if cpuflag(sse4)
+     packusdw   m0, m2
+     pminsw     m0, m3
+ %else
+@@ -216,14 +219,14 @@ DECLARE_REG_TMP 7
+ %endif
+ %endmacro
+ 
+-%macro BIWEIGHT_FUNC_DBL 1
+-cglobal h264_biweight_16_10_%1
++%macro BIWEIGHT_FUNC_DBL 0
++cglobal h264_biweight_16_10
+     BIWEIGHT_PROLOGUE
+-    BIWEIGHT_SETUP %1
++    BIWEIGHT_SETUP
+ .nextrow:
+-    BIWEIGHT  %1,  0
++    BIWEIGHT   0
+     mova [r0   ], m0
+-    BIWEIGHT  %1, 16
++    BIWEIGHT  16
+     mova [r0+16], m0
+     add       r0, r2
+     add       r1, r2
+@@ -232,16 +235,17 @@ cglobal h264_biweight_16_10_%1
+     REP_RET
+ %endmacro
+ 
+-INIT_XMM
+-BIWEIGHT_FUNC_DBL sse2
+-BIWEIGHT_FUNC_DBL sse4
++INIT_XMM sse2
++BIWEIGHT_FUNC_DBL
++INIT_XMM sse4
++BIWEIGHT_FUNC_DBL
+ 
+-%macro BIWEIGHT_FUNC 1
+-cglobal h264_biweight_8_10_%1
++%macro BIWEIGHT_FUNC 0
++cglobal h264_biweight_8_10
+     BIWEIGHT_PROLOGUE
+-    BIWEIGHT_SETUP %1
++    BIWEIGHT_SETUP
+ .nextrow:
+-    BIWEIGHT %1, 0
++    BIWEIGHT  0
+     mova   [r0], m0
+     add      r0, r2
+     add      r1, r2
+@@ -250,18 +254,19 @@ cglobal h264_biweight_8_10_%1
+     REP_RET
+ %endmacro
+ 
+-INIT_XMM
+-BIWEIGHT_FUNC sse2
+-BIWEIGHT_FUNC sse4
++INIT_XMM sse2
++BIWEIGHT_FUNC
++INIT_XMM sse4
++BIWEIGHT_FUNC
+ 
+-%macro BIWEIGHT_FUNC_HALF 1
+-cglobal h264_biweight_4_10_%1
++%macro BIWEIGHT_FUNC_HALF 0
++cglobal h264_biweight_4_10
+     BIWEIGHT_PROLOGUE
+-    BIWEIGHT_SETUP %1
++    BIWEIGHT_SETUP
+     sar        r3d, 1
+     lea        r4, [r2*2]
+ .nextrow:
+-    BIWEIGHT    %1, 0, r2
++    BIWEIGHT     0, r2
+     movh   [r0   ], m0
+     movhps [r0+r2], m0
+     add         r0, r4
+@@ -271,6 +276,7 @@ cglobal h264_biweight_4_10_%1
+     REP_RET
+ %endmacro
+ 
+-INIT_XMM
+-BIWEIGHT_FUNC_HALF sse2
+-BIWEIGHT_FUNC_HALF sse4
++INIT_XMM sse2
++BIWEIGHT_FUNC_HALF
++INIT_XMM sse4
++BIWEIGHT_FUNC_HALF
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0261-Drop-broken-and-unused-CABAC-test-program.patch b/debian/patches/post-9beta2/0261-Drop-broken-and-unused-CABAC-test-program.patch
new file mode 100644
index 0000000..2e003da
--- /dev/null
+++ b/debian/patches/post-9beta2/0261-Drop-broken-and-unused-CABAC-test-program.patch
@@ -0,0 +1,182 @@
+From da39cac8def7ea73cad2fa2b611209663c7abe2c Mon Sep 17 00:00:00 2001
+From: Diego Biurrun <diego at biurrun.de>
+Date: Fri, 5 Oct 2012 12:12:52 +0200
+Subject: [PATCH 261/278] Drop broken and unused CABAC test program.
+
+---
+ libavcodec/Makefile |    3 +-
+ libavcodec/cabac.c  |  147 ---------------------------------------------------
+ 2 files changed, 1 insertion(+), 149 deletions(-)
+
+diff --git a/libavcodec/Makefile b/libavcodec/Makefile
+index 4d14aea..775cabe 100644
+--- a/libavcodec/Makefile
++++ b/libavcodec/Makefile
+@@ -676,8 +676,7 @@ SKIPHEADERS-$(HAVE_W32THREADS)         += w32pthreads.h
+ 
+ EXAMPLES = api
+ 
+-TESTPROGS = cabac                                                       \
+-            dct                                                         \
++TESTPROGS = dct                                                         \
+             fft                                                         \
+             fft-fixed                                                   \
+             golomb                                                      \
+diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c
+index bd7d949..02d2911 100644
+--- a/libavcodec/cabac.c
++++ b/libavcodec/cabac.c
+@@ -162,150 +162,3 @@ void ff_init_cabac_states(CABACContext *c){
+       ff_h264_last_coeff_flag_offset_8x8[i] = last_coeff_flag_offset_8x8[i];
+     }
+ }
+-
+-#ifdef TEST
+-#define SIZE 10240
+-
+-#include "libavutil/lfg.h"
+-#include "avcodec.h"
+-#include "cabac.h"
+-
+-static inline void put_cabac_bit(CABACContext *c, int b){
+-    put_bits(&c->pb, 1, b);
+-    for(;c->outstanding_count; c->outstanding_count--){
+-        put_bits(&c->pb, 1, 1-b);
+-    }
+-}
+-
+-static inline void renorm_cabac_encoder(CABACContext *c){
+-    while(c->range < 0x100){
+-        //FIXME optimize
+-        if(c->low<0x100){
+-            put_cabac_bit(c, 0);
+-        }else if(c->low<0x200){
+-            c->outstanding_count++;
+-            c->low -= 0x100;
+-        }else{
+-            put_cabac_bit(c, 1);
+-            c->low -= 0x200;
+-        }
+-
+-        c->range+= c->range;
+-        c->low += c->low;
+-    }
+-}
+-
+-static void put_cabac(CABACContext *c, uint8_t * const state, int bit){
+-    int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + *state];
+-
+-    if(bit == ((*state)&1)){
+-        c->range -= RangeLPS;
+-        *state    = h264_mps_state[*state];
+-    }else{
+-        c->low += c->range - RangeLPS;
+-        c->range = RangeLPS;
+-    }
+-
+-    renorm_cabac_encoder(c);
+-}
+-
+-/**
+- * @param bit 0 -> write zero bit, !=0 write one bit
+- */
+-static void put_cabac_bypass(CABACContext *c, int bit){
+-    c->low += c->low;
+-
+-    if(bit){
+-        c->low += c->range;
+-    }
+-//FIXME optimize
+-    if(c->low<0x200){
+-        put_cabac_bit(c, 0);
+-    }else if(c->low<0x400){
+-        c->outstanding_count++;
+-        c->low -= 0x200;
+-    }else{
+-        put_cabac_bit(c, 1);
+-        c->low -= 0x400;
+-    }
+-}
+-
+-/**
+- *
+- * @return the number of bytes written
+- */
+-static int put_cabac_terminate(CABACContext *c, int bit){
+-    c->range -= 2;
+-
+-    if(!bit){
+-        renorm_cabac_encoder(c);
+-    }else{
+-        c->low += c->range;
+-        c->range= 2;
+-
+-        renorm_cabac_encoder(c);
+-
+-        assert(c->low <= 0x1FF);
+-        put_cabac_bit(c, c->low>>9);
+-        put_bits(&c->pb, 2, ((c->low>>7)&3)|1);
+-
+-        flush_put_bits(&c->pb); //FIXME FIXME FIXME XXX wrong
+-    }
+-
+-    return (put_bits_count(&c->pb)+7)>>3;
+-}
+-
+-int main(void){
+-    CABACContext c;
+-    uint8_t b[9*SIZE];
+-    uint8_t r[9*SIZE];
+-    int i;
+-    uint8_t state[10]= {0};
+-    AVLFG prng;
+-
+-    av_lfg_init(&prng, 1);
+-    ff_init_cabac_encoder(&c, b, SIZE);
+-    ff_init_cabac_states(&c);
+-
+-    for(i=0; i<SIZE; i++){
+-        r[i] = av_lfg_get(&prng) % 7;
+-    }
+-
+-    for(i=0; i<SIZE; i++){
+-START_TIMER
+-        put_cabac_bypass(&c, r[i]&1);
+-STOP_TIMER("put_cabac_bypass")
+-    }
+-
+-    for(i=0; i<SIZE; i++){
+-START_TIMER
+-        put_cabac(&c, state, r[i]&1);
+-STOP_TIMER("put_cabac")
+-    }
+-
+-    put_cabac_terminate(&c, 1);
+-
+-    ff_init_cabac_decoder(&c, b, SIZE);
+-
+-    memset(state, 0, sizeof(state));
+-
+-    for(i=0; i<SIZE; i++){
+-START_TIMER
+-        if( (r[i]&1) != get_cabac_bypass(&c) )
+-            av_log(NULL, AV_LOG_ERROR, "CABAC bypass failure at %d\n", i);
+-STOP_TIMER("get_cabac_bypass")
+-    }
+-
+-    for(i=0; i<SIZE; i++){
+-START_TIMER
+-        if( (r[i]&1) != get_cabac(&c, state) )
+-            av_log(NULL, AV_LOG_ERROR, "CABAC failure at %d\n", i);
+-STOP_TIMER("get_cabac")
+-    }
+-    if(!get_cabac_terminate(&c))
+-        av_log(NULL, AV_LOG_ERROR, "where's the Terminator?\n");
+-
+-    return 0;
+-}
+-
+-#endif /* TEST */
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0262-x86-mmx2-mmxext-in-asm-constructs.patch b/debian/patches/post-9beta2/0262-x86-mmx2-mmxext-in-asm-constructs.patch
new file mode 100644
index 0000000..2eb2e5c
--- /dev/null
+++ b/debian/patches/post-9beta2/0262-x86-mmx2-mmxext-in-asm-constructs.patch
@@ -0,0 +1,1888 @@
+From 26301caaa1aec5d71b564bff452147d6183370bf Mon Sep 17 00:00:00 2001
+From: Diego Biurrun <diego at biurrun.de>
+Date: Tue, 10 Jul 2012 00:04:18 +0200
+Subject: [PATCH 262/278] x86: mmx2 ---> mmxext in asm constructs
+
+---
+ libavcodec/x86/ac3dsp.asm               |    4 +-
+ libavcodec/x86/ac3dsp_init.c            |    4 +-
+ libavcodec/x86/dsputil.asm              |    8 +--
+ libavcodec/x86/dsputil_mmx.c            |   56 ++++++++--------
+ libavcodec/x86/dsputilenc.asm           |    2 +-
+ libavcodec/x86/dsputilenc_mmx.c         |    6 +-
+ libavcodec/x86/h264_chromamc.asm        |   14 ++--
+ libavcodec/x86/h264_chromamc_10bit.asm  |    4 +-
+ libavcodec/x86/h264_deblock.asm         |   20 +++---
+ libavcodec/x86/h264_deblock_10bit.asm   |    4 +-
+ libavcodec/x86/h264_idct.asm            |   46 ++++++-------
+ libavcodec/x86/h264_idct_10bit.asm      |    2 +-
+ libavcodec/x86/h264_intrapred.asm       |   26 ++++----
+ libavcodec/x86/h264_intrapred_10bit.asm |   20 +++---
+ libavcodec/x86/h264_intrapred_init.c    |   80 +++++++++++------------
+ libavcodec/x86/h264_weight.asm          |   12 ++--
+ libavcodec/x86/h264dsp_init.c           |  107 ++++++++++++++++---------------
+ libavcodec/x86/pngdsp.asm               |    2 +-
+ libavcodec/x86/pngdsp_init.c            |    6 +-
+ libavcodec/x86/rv34dsp.asm              |    6 +-
+ libavcodec/x86/rv34dsp_init.c           |   10 +--
+ libavcodec/x86/rv40dsp.asm              |    4 +-
+ libavcodec/x86/rv40dsp_init.c           |   30 ++++-----
+ libavcodec/x86/vc1dsp_init.c            |    6 +-
+ libavcodec/x86/vp3dsp.asm               |    4 +-
+ libavcodec/x86/vp3dsp_init.c            |   16 +++--
+ libavcodec/x86/vp8dsp.asm               |   30 ++++-----
+ libavcodec/x86/vp8dsp_init.c            |   86 ++++++++++++-------------
+ libavutil/x86/x86util.asm               |    2 +-
+ libswscale/x86/output.asm               |    4 +-
+ libswscale/x86/swscale.c                |    8 +--
+ 31 files changed, 317 insertions(+), 312 deletions(-)
+
+diff --git a/libavcodec/x86/ac3dsp.asm b/libavcodec/x86/ac3dsp.asm
+index 2c453c5..a5d9458 100644
+--- a/libavcodec/x86/ac3dsp.asm
++++ b/libavcodec/x86/ac3dsp.asm
+@@ -97,7 +97,7 @@ AC3_EXPONENT_MIN
+     por         %1, %2
+     pshuflw     %2, %1, q0001
+     por         %1, %2
+-%elif cpuflag(mmx2)
++%elif cpuflag(mmxext)
+     pshufw      %2, %1, q0032
+     por         %1, %2
+     pshufw      %2, %1, q0001
+@@ -153,7 +153,7 @@ cglobal ac3_max_msb_abs_int16, 2,2,5, src, len
+ INIT_MMX mmx
+ %define ABS2 ABS2_MMX
+ AC3_MAX_MSB_ABS_INT16 or_abs
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ %define ABS2 ABS2_MMXEXT
+ AC3_MAX_MSB_ABS_INT16 min_max
+ INIT_XMM sse2
+diff --git a/libavcodec/x86/ac3dsp_init.c b/libavcodec/x86/ac3dsp_init.c
+index 5008d65..b32145b 100644
+--- a/libavcodec/x86/ac3dsp_init.c
++++ b/libavcodec/x86/ac3dsp_init.c
+@@ -31,7 +31,7 @@ extern void ff_ac3_exponent_min_mmxext(uint8_t *exp, int num_reuse_blocks, int n
+ extern void ff_ac3_exponent_min_sse2  (uint8_t *exp, int num_reuse_blocks, int nb_coefs);
+ 
+ extern int ff_ac3_max_msb_abs_int16_mmx  (const int16_t *src, int len);
+-extern int ff_ac3_max_msb_abs_int16_mmx2 (const int16_t *src, int len);
++extern int ff_ac3_max_msb_abs_int16_mmxext(const int16_t *src, int len);
+ extern int ff_ac3_max_msb_abs_int16_sse2 (const int16_t *src, int len);
+ extern int ff_ac3_max_msb_abs_int16_ssse3(const int16_t *src, int len);
+ 
+@@ -182,7 +182,7 @@ av_cold void ff_ac3dsp_init_x86(AC3DSPContext *c, int bit_exact)
+     }
+     if (EXTERNAL_MMXEXT(mm_flags)) {
+         c->ac3_exponent_min = ff_ac3_exponent_min_mmxext;
+-        c->ac3_max_msb_abs_int16 = ff_ac3_max_msb_abs_int16_mmx2;
++        c->ac3_max_msb_abs_int16 = ff_ac3_max_msb_abs_int16_mmxext;
+     }
+     if (EXTERNAL_SSE(mm_flags)) {
+         c->float_to_fixed24 = ff_float_to_fixed24_sse;
+diff --git a/libavcodec/x86/dsputil.asm b/libavcodec/x86/dsputil.asm
+index c9118a1..1a429ae 100644
+--- a/libavcodec/x86/dsputil.asm
++++ b/libavcodec/x86/dsputil.asm
+@@ -108,7 +108,7 @@ cglobal scalarproduct_and_madd_int16_%1, 4,4,8, v1, v2, v3, order, mul
+ %endmacro
+ 
+ INIT_MMX
+-SCALARPRODUCT mmx2
++SCALARPRODUCT mmxext
+ INIT_XMM
+ SCALARPRODUCT sse2
+ 
+@@ -327,8 +327,8 @@ APPLY_WINDOW_INT16 ssse3_atom, 0, 1
+ APPLY_WINDOW_INT16 ssse3,      0, 1
+ 
+ 
+-; void add_hfyu_median_prediction_mmx2(uint8_t *dst, const uint8_t *top, const uint8_t *diff, int w, int *left, int *left_top)
+-cglobal add_hfyu_median_prediction_mmx2, 6,6,0, dst, top, diff, w, left, left_top
++; void add_hfyu_median_prediction_mmxext(uint8_t *dst, const uint8_t *top, const uint8_t *diff, int w, int *left, int *left_top)
++cglobal add_hfyu_median_prediction_mmxext, 6,6,0, dst, top, diff, w, left, left_top
+     movq    mm0, [topq]
+     movq    mm2, mm0
+     movd    mm4, [left_topq]
+@@ -804,7 +804,7 @@ ALIGN 128
+     mov        valh, vall
+ %if %1 >= 8
+     movd        mm0, vald
+-%if cpuflag(mmx2)
++%if cpuflag(mmxext)
+     pshufw      mm0, mm0, 0
+ %else ; mmx
+     punpcklwd   mm0, mm0
+diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
+index 74559f4..71e10a8 100644
+--- a/libavcodec/x86/dsputil_mmx.c
++++ b/libavcodec/x86/dsputil_mmx.c
+@@ -2045,21 +2045,21 @@ PREFETCH(prefetch_3dnow, prefetch)
+ 
+ void ff_put_h264_chroma_mc8_rnd_mmx  (uint8_t *dst, uint8_t *src,
+                                       int stride, int h, int x, int y);
+-void ff_avg_h264_chroma_mc8_rnd_mmx2 (uint8_t *dst, uint8_t *src,
+-                                      int stride, int h, int x, int y);
++void ff_avg_h264_chroma_mc8_rnd_mmxext(uint8_t *dst, uint8_t *src,
++                                       int stride, int h, int x, int y);
+ void ff_avg_h264_chroma_mc8_rnd_3dnow(uint8_t *dst, uint8_t *src,
+                                       int stride, int h, int x, int y);
+ 
+ void ff_put_h264_chroma_mc4_mmx      (uint8_t *dst, uint8_t *src,
+                                       int stride, int h, int x, int y);
+-void ff_avg_h264_chroma_mc4_mmx2     (uint8_t *dst, uint8_t *src,
++void ff_avg_h264_chroma_mc4_mmxext   (uint8_t *dst, uint8_t *src,
+                                       int stride, int h, int x, int y);
+ void ff_avg_h264_chroma_mc4_3dnow    (uint8_t *dst, uint8_t *src,
+                                       int stride, int h, int x, int y);
+ 
+-void ff_put_h264_chroma_mc2_mmx2     (uint8_t *dst, uint8_t *src,
++void ff_put_h264_chroma_mc2_mmxext   (uint8_t *dst, uint8_t *src,
+                                       int stride, int h, int x, int y);
+-void ff_avg_h264_chroma_mc2_mmx2     (uint8_t *dst, uint8_t *src,
++void ff_avg_h264_chroma_mc2_mmxext   (uint8_t *dst, uint8_t *src,
+                                       int stride, int h, int x, int y);
+ 
+ void ff_put_h264_chroma_mc8_rnd_ssse3(uint8_t *dst, uint8_t *src,
+@@ -2077,10 +2077,10 @@ void ff_ ## OP ## _h264_chroma_mc ## NUM ## _ ## DEPTH ## _ ## OPT      \
+                                       (uint8_t *dst, uint8_t *src,      \
+                                        int stride, int h, int x, int y);
+ 
+-CHROMA_MC(put, 2, 10, mmx2)
+-CHROMA_MC(avg, 2, 10, mmx2)
+-CHROMA_MC(put, 4, 10, mmx2)
+-CHROMA_MC(avg, 4, 10, mmx2)
++CHROMA_MC(put, 2, 10, mmxext)
++CHROMA_MC(avg, 2, 10, mmxext)
++CHROMA_MC(put, 4, 10, mmxext)
++CHROMA_MC(avg, 4, 10, mmxext)
+ CHROMA_MC(put, 8, 10, sse2)
+ CHROMA_MC(avg, 8, 10, sse2)
+ CHROMA_MC(put, 8, 10, avx)
+@@ -2283,13 +2283,13 @@ static void vector_clipf_sse(float *dst, const float *src,
+ 
+ #endif /* HAVE_INLINE_ASM */
+ 
+-int32_t ff_scalarproduct_int16_mmx2(const int16_t *v1, const int16_t *v2,
+-                                    int order);
++int32_t ff_scalarproduct_int16_mmxext(const int16_t *v1, const int16_t *v2,
++                                      int order);
+ int32_t ff_scalarproduct_int16_sse2(const int16_t *v1, const int16_t *v2,
+                                     int order);
+-int32_t ff_scalarproduct_and_madd_int16_mmx2(int16_t *v1, const int16_t *v2,
+-                                             const int16_t *v3,
+-                                             int order, int mul);
++int32_t ff_scalarproduct_and_madd_int16_mmxext(int16_t *v1, const int16_t *v2,
++                                               const int16_t *v3,
++                                               int order, int mul);
+ int32_t ff_scalarproduct_and_madd_int16_sse2(int16_t *v1, const int16_t *v2,
+                                              const int16_t *v3,
+                                              int order, int mul);
+@@ -2313,9 +2313,9 @@ void ff_apply_window_int16_ssse3_atom(int16_t *output, const int16_t *input,
+ void ff_bswap32_buf_ssse3(uint32_t *dst, const uint32_t *src, int w);
+ void ff_bswap32_buf_sse2(uint32_t *dst, const uint32_t *src, int w);
+ 
+-void ff_add_hfyu_median_prediction_mmx2(uint8_t *dst, const uint8_t *top,
+-                                        const uint8_t *diff, int w,
+-                                        int *left, int *left_top);
++void ff_add_hfyu_median_prediction_mmxext(uint8_t *dst, const uint8_t *top,
++                                          const uint8_t *diff, int w,
++                                          int *left, int *left_top);
+ int  ff_add_hfyu_left_prediction_ssse3(uint8_t *dst, const uint8_t *src,
+                                        int w, int left);
+ int  ff_add_hfyu_left_prediction_sse4(uint8_t *dst, const uint8_t *src,
+@@ -2548,24 +2548,24 @@ static void dsputil_init_mmxext(DSPContext *c, AVCodecContext *avctx,
+ 
+ #if HAVE_YASM
+     if (!high_bit_depth && CONFIG_H264CHROMA) {
+-        c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_rnd_mmx2;
+-        c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_mmx2;
+-        c->avg_h264_chroma_pixels_tab[2] = ff_avg_h264_chroma_mc2_mmx2;
+-        c->put_h264_chroma_pixels_tab[2] = ff_put_h264_chroma_mc2_mmx2;
++        c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_rnd_mmxext;
++        c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_mmxext;
++        c->avg_h264_chroma_pixels_tab[2] = ff_avg_h264_chroma_mc2_mmxext;
++        c->put_h264_chroma_pixels_tab[2] = ff_put_h264_chroma_mc2_mmxext;
+     }
+     if (bit_depth == 10 && CONFIG_H264CHROMA) {
+-        c->put_h264_chroma_pixels_tab[2] = ff_put_h264_chroma_mc2_10_mmx2;
+-        c->avg_h264_chroma_pixels_tab[2] = ff_avg_h264_chroma_mc2_10_mmx2;
+-        c->put_h264_chroma_pixels_tab[1] = ff_put_h264_chroma_mc4_10_mmx2;
+-        c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_10_mmx2;
++        c->put_h264_chroma_pixels_tab[2] = ff_put_h264_chroma_mc2_10_mmxext;
++        c->avg_h264_chroma_pixels_tab[2] = ff_avg_h264_chroma_mc2_10_mmxext;
++        c->put_h264_chroma_pixels_tab[1] = ff_put_h264_chroma_mc4_10_mmxext;
++        c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_10_mmxext;
+     }
+ 
+     /* slower than cmov version on AMD */
+     if (!(mm_flags & AV_CPU_FLAG_3DNOW))
+-        c->add_hfyu_median_prediction = ff_add_hfyu_median_prediction_mmx2;
++        c->add_hfyu_median_prediction = ff_add_hfyu_median_prediction_mmxext;
+ 
+-    c->scalarproduct_int16          = ff_scalarproduct_int16_mmx2;
+-    c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_mmx2;
++    c->scalarproduct_int16          = ff_scalarproduct_int16_mmxext;
++    c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_mmxext;
+ 
+     if (avctx->flags & CODEC_FLAG_BITEXACT) {
+         c->apply_window_int16 = ff_apply_window_int16_mmxext_ba;
+diff --git a/libavcodec/x86/dsputilenc.asm b/libavcodec/x86/dsputilenc.asm
+index 6c4fb50..c5ba78a 100644
+--- a/libavcodec/x86/dsputilenc.asm
++++ b/libavcodec/x86/dsputilenc.asm
+@@ -265,7 +265,7 @@ HADAMARD8_DIFF_MMX mmx
+ 
+ %define ABS1 ABS1_MMXEXT
+ %define HSUM HSUM_MMXEXT
+-HADAMARD8_DIFF_MMX mmx2
++HADAMARD8_DIFF_MMX mmxext
+ 
+ INIT_XMM
+ %define ABS2 ABS2_MMXEXT
+diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c
+index 883d965..e5d2473 100644
+--- a/libavcodec/x86/dsputilenc_mmx.c
++++ b/libavcodec/x86/dsputilenc_mmx.c
+@@ -1104,7 +1104,7 @@ int ff_hadamard8_diff16_##cpu(void *s, uint8_t *src1, uint8_t *src2, \
+                               int stride, int h);
+ 
+ hadamard_func(mmx)
+-hadamard_func(mmx2)
++hadamard_func(mmxext)
+ hadamard_func(sse2)
+ hadamard_func(ssse3)
+ 
+@@ -1195,8 +1195,8 @@ void ff_dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx)
+         c->hadamard8_diff[1] = ff_hadamard8_diff_mmx;
+ 
+         if (EXTERNAL_MMXEXT(mm_flags)) {
+-            c->hadamard8_diff[0] = ff_hadamard8_diff16_mmx2;
+-            c->hadamard8_diff[1] = ff_hadamard8_diff_mmx2;
++            c->hadamard8_diff[0] = ff_hadamard8_diff16_mmxext;
++            c->hadamard8_diff[1] = ff_hadamard8_diff_mmxext;
+         }
+ 
+         if (EXTERNAL_SSE2(mm_flags)) {
+diff --git a/libavcodec/x86/h264_chromamc.asm b/libavcodec/x86/h264_chromamc.asm
+index dc427d7..2dd4603 100644
+--- a/libavcodec/x86/h264_chromamc.asm
++++ b/libavcodec/x86/h264_chromamc.asm
+@@ -442,17 +442,17 @@ chroma_mc8_mmx_func put, vc1,  nornd_mmx
+ chroma_mc8_mmx_func put, rv40, mmx
+ chroma_mc4_mmx_func put, h264, mmx
+ chroma_mc4_mmx_func put, rv40, mmx
+-chroma_mc2_mmx_func put, h264, mmx2
++chroma_mc2_mmx_func put, h264, mmxext
+ 
+ %define CHROMAMC_AVG  DIRECT_AVG
+ %define CHROMAMC_AVG4 COPY_AVG
+ %define PAVG          pavgb
+-chroma_mc8_mmx_func avg, h264, rnd_mmx2
+-chroma_mc8_mmx_func avg, vc1,  nornd_mmx2
+-chroma_mc8_mmx_func avg, rv40, mmx2
+-chroma_mc4_mmx_func avg, h264, mmx2
+-chroma_mc4_mmx_func avg, rv40, mmx2
+-chroma_mc2_mmx_func avg, h264, mmx2
++chroma_mc8_mmx_func avg, h264, rnd_mmxext
++chroma_mc8_mmx_func avg, vc1,  nornd_mmxext
++chroma_mc8_mmx_func avg, rv40, mmxext
++chroma_mc4_mmx_func avg, h264, mmxext
++chroma_mc4_mmx_func avg, rv40, mmxext
++chroma_mc2_mmx_func avg, h264, mmxext
+ 
+ %define PAVG          pavgusb
+ chroma_mc8_mmx_func avg, h264, rnd_3dnow
+diff --git a/libavcodec/x86/h264_chromamc_10bit.asm b/libavcodec/x86/h264_chromamc_10bit.asm
+index 2619737..aec7678 100644
+--- a/libavcodec/x86/h264_chromamc_10bit.asm
++++ b/libavcodec/x86/h264_chromamc_10bit.asm
+@@ -253,7 +253,7 @@ INIT_XMM sse2
+ CHROMA_MC8 put
+ INIT_XMM avx
+ CHROMA_MC8 put
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ CHROMA_MC4 put
+ CHROMA_MC2 put
+ 
+@@ -262,6 +262,6 @@ INIT_XMM sse2
+ CHROMA_MC8 avg
+ INIT_XMM avx
+ CHROMA_MC8 avg
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ CHROMA_MC4 avg
+ CHROMA_MC2 avg
+diff --git a/libavcodec/x86/h264_deblock.asm b/libavcodec/x86/h264_deblock.asm
+index f5de7c9..c124c4d 100644
+--- a/libavcodec/x86/h264_deblock.asm
++++ b/libavcodec/x86/h264_deblock.asm
+@@ -504,7 +504,7 @@ cglobal deblock_h_luma_8, 0,5
+     RET
+ %endmacro ; DEBLOCK_LUMA
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ DEBLOCK_LUMA v8, 8
+ INIT_XMM sse2
+ DEBLOCK_LUMA v, 16
+@@ -783,11 +783,11 @@ DEBLOCK_LUMA_INTRA v
+ INIT_XMM avx
+ DEBLOCK_LUMA_INTRA v
+ %if ARCH_X86_64 == 0
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ DEBLOCK_LUMA_INTRA v8
+ %endif
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ 
+ %macro CHROMA_V_START 0
+     dec    r2d      ; alpha-1
+@@ -818,7 +818,7 @@ cglobal deblock_v_chroma_8, 5,6
+     movq  m1, [t5+r1]
+     movq  m2, [r0]
+     movq  m3, [r0+r1]
+-    call ff_chroma_inter_body_mmx2
++    call ff_chroma_inter_body_mmxext
+     movq  [t5+r1], m1
+     movq  [r0], m2
+     RET
+@@ -842,7 +842,7 @@ cglobal deblock_h_chroma_8, 5,7
+     TRANSPOSE4x8_LOAD  bw, wd, dq, PASS8ROWS(t5, r0, r1, t6)
+     movq  buf0, m0
+     movq  buf1, m3
+-    call ff_chroma_inter_body_mmx2
++    call ff_chroma_inter_body_mmxext
+     movq  m0, buf0
+     movq  m3, buf1
+     TRANSPOSE8x4B_STORE PASS8ROWS(t5, r0, r1, t6)
+@@ -852,7 +852,7 @@ cglobal deblock_h_chroma_8, 5,7
+     RET
+ 
+ ALIGN 16
+-ff_chroma_inter_body_mmx2:
++ff_chroma_inter_body_mmxext:
+     LOAD_MASK  r2d, r3d
+     movd       m6, [r4] ; tc0
+     punpcklbw  m6, m6
+@@ -885,7 +885,7 @@ cglobal deblock_v_chroma_intra_8, 4,5
+     movq  m1, [t5+r1]
+     movq  m2, [r0]
+     movq  m3, [r0+r1]
+-    call ff_chroma_intra_body_mmx2
++    call ff_chroma_intra_body_mmxext
+     movq  [t5+r1], m1
+     movq  [r0], m2
+     RET
+@@ -896,12 +896,12 @@ cglobal deblock_v_chroma_intra_8, 4,5
+ cglobal deblock_h_chroma_intra_8, 4,6
+     CHROMA_H_START
+     TRANSPOSE4x8_LOAD  bw, wd, dq, PASS8ROWS(t5, r0, r1, t6)
+-    call ff_chroma_intra_body_mmx2
++    call ff_chroma_intra_body_mmxext
+     TRANSPOSE8x4B_STORE PASS8ROWS(t5, r0, r1, t6)
+     RET
+ 
+ ALIGN 16
+-ff_chroma_intra_body_mmx2:
++ff_chroma_intra_body_mmxext:
+     LOAD_MASK r2d, r3d
+     movq   m5, m1
+     movq   m6, m2
+@@ -1025,7 +1025,7 @@ ff_chroma_intra_body_mmx2:
+     jl %%.b_idx_loop
+ %endmacro
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ cglobal h264_loop_filter_strength, 9, 9, 0, bs, nnz, ref, mv, bidir, edges, \
+                                             step, mask_mv0, mask_mv1, field
+ %define b_idxq bidirq
+diff --git a/libavcodec/x86/h264_deblock_10bit.asm b/libavcodec/x86/h264_deblock_10bit.asm
+index e105c6c..3b81ef6 100644
+--- a/libavcodec/x86/h264_deblock_10bit.asm
++++ b/libavcodec/x86/h264_deblock_10bit.asm
+@@ -791,7 +791,7 @@ cglobal deblock_h_luma_intra_10, 4,7,8*(mmsize/16)
+ %endmacro
+ 
+ %if ARCH_X86_64 == 0
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ DEBLOCK_LUMA
+ DEBLOCK_LUMA_INTRA
+ INIT_XMM sse2
+@@ -906,7 +906,7 @@ cglobal deblock_v_chroma_intra_10, 4,6-(mmsize/16),8*(mmsize/16)
+ %endmacro
+ 
+ %if ARCH_X86_64 == 0
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ DEBLOCK_CHROMA
+ %endif
+ INIT_XMM sse2
+diff --git a/libavcodec/x86/h264_idct.asm b/libavcodec/x86/h264_idct.asm
+index 5e779cb..cd1f545 100644
+--- a/libavcodec/x86/h264_idct.asm
++++ b/libavcodec/x86/h264_idct.asm
+@@ -286,14 +286,14 @@ cglobal h264_idct8_add_8_sse2, 3, 4, 10
+ %endmacro
+ 
+ INIT_MMX
+-; ff_h264_idct_dc_add_mmx2(uint8_t *dst, int16_t *block, int stride)
+-cglobal h264_idct_dc_add_8_mmx2, 3, 3, 0
++; ff_h264_idct_dc_add_mmxext(uint8_t *dst, int16_t *block, int stride)
++cglobal h264_idct_dc_add_8_mmxext, 3, 3, 0
+     DC_ADD_MMXEXT_INIT r1, r2
+     DC_ADD_MMXEXT_OP movh, r0, r2, r1
+     RET
+ 
+-; ff_h264_idct8_dc_add_mmx2(uint8_t *dst, int16_t *block, int stride)
+-cglobal h264_idct8_dc_add_8_mmx2, 3, 3, 0
++; ff_h264_idct8_dc_add_mmxext(uint8_t *dst, int16_t *block, int stride)
++cglobal h264_idct8_dc_add_8_mmxext, 3, 3, 0
+     DC_ADD_MMXEXT_INIT r1, r2
+     DC_ADD_MMXEXT_OP mova, r0, r2, r1
+     lea          r0, [r0+r2*4]
+@@ -354,9 +354,9 @@ cglobal h264_idct8_add4_8_mmx, 5, 7 + npicregs, 0, dst, block_offset, block, str
+     ADD         rsp, pad
+     RET
+ 
+-; ff_h264_idct_add16_mmx2(uint8_t *dst, const int *block_offset,
+-;                         DCTELEM *block, int stride, const uint8_t nnzc[6*8])
+-cglobal h264_idct_add16_8_mmx2, 5, 8 + npicregs, 0, dst1, block_offset, block, stride, nnzc, cntr, coeff, dst2, picreg
++; ff_h264_idct_add16_mmxext(uint8_t *dst, const int *block_offset,
++;                           DCTELEM *block, int stride, const uint8_t nnzc[6*8])
++cglobal h264_idct_add16_8_mmxext, 5, 8 + npicregs, 0, dst1, block_offset, block, stride, nnzc, cntr, coeff, dst2, picreg
+     xor          r5, r5
+ %ifdef PIC
+     lea     picregq, [scan8_mem]
+@@ -421,9 +421,10 @@ cglobal h264_idct_add16intra_8_mmx, 5, 7 + npicregs, 0, dst, block_offset, block
+     jl .nextblock
+     REP_RET
+ 
+-; ff_h264_idct_add16intra_mmx2(uint8_t *dst, const int *block_offset,
+-;                              DCTELEM *block, int stride, const uint8_t nnzc[6*8])
+-cglobal h264_idct_add16intra_8_mmx2, 5, 8 + npicregs, 0, dst1, block_offset, block, stride, nnzc, cntr, coeff, dst2, picreg
++; ff_h264_idct_add16intra_mmxext(uint8_t *dst, const int *block_offset,
++;                                DCTELEM *block, int stride,
++;                                const uint8_t nnzc[6*8])
++cglobal h264_idct_add16intra_8_mmxext, 5, 8 + npicregs, 0, dst1, block_offset, block, stride, nnzc, cntr, coeff, dst2, picreg
+     xor          r5, r5
+ %ifdef PIC
+     lea     picregq, [scan8_mem]
+@@ -463,9 +464,10 @@ cglobal h264_idct_add16intra_8_mmx2, 5, 8 + npicregs, 0, dst1, block_offset, blo
+     jl .nextblock
+     REP_RET
+ 
+-; ff_h264_idct8_add4_mmx2(uint8_t *dst, const int *block_offset,
+-;                         DCTELEM *block, int stride, const uint8_t nnzc[6*8])
+-cglobal h264_idct8_add4_8_mmx2, 5, 8 + npicregs, 0, dst1, block_offset, block, stride, nnzc, cntr, coeff, dst2, picreg
++; ff_h264_idct8_add4_mmxext(uint8_t *dst, const int *block_offset,
++;                           DCTELEM *block, int stride,
++;                           const uint8_t nnzc[6*8])
++cglobal h264_idct8_add4_8_mmxext, 5, 8 + npicregs, 0, dst1, block_offset, block, stride, nnzc, cntr, coeff, dst2, picreg
+     %assign pad 128+4-(stack_offset&7)
+     SUB         rsp, pad
+ 
+@@ -620,7 +622,7 @@ cglobal h264_idct_add8_8_mmx, 5, 8 + npicregs, 0, dst1, block_offset, block, str
+     call         h264_idct_add8_mmx_plane
+     RET
+ 
+-h264_idct_add8_mmx2_plane:
++h264_idct_add8_mmxext_plane:
+ .nextblock:
+     movzx        r6, byte [scan8+r5]
+     movzx        r6, byte [r4+r6]
+@@ -661,9 +663,9 @@ h264_idct_add8_mmx2_plane:
+     jnz .nextblock
+     rep ret
+ 
+-; ff_h264_idct_add8_mmx2(uint8_t **dest, const int *block_offset,
+-;                        DCTELEM *block, int stride, const uint8_t nnzc[6*8])
+-cglobal h264_idct_add8_8_mmx2, 5, 8 + npicregs, 0, dst1, block_offset, block, stride, nnzc, cntr, coeff, dst2, picreg
++; ff_h264_idct_add8_mmxext(uint8_t **dest, const int *block_offset,
++;                          DCTELEM *block, int stride, const uint8_t nnzc[6*8])
++cglobal h264_idct_add8_8_mmxext, 5, 8 + npicregs, 0, dst1, block_offset, block, stride, nnzc, cntr, coeff, dst2, picreg
+     mov          r5, 16
+     add          r2, 512
+ %if ARCH_X86_64
+@@ -672,7 +674,7 @@ cglobal h264_idct_add8_8_mmx2, 5, 8 + npicregs, 0, dst1, block_offset, block, st
+ %ifdef PIC
+     lea     picregq, [scan8_mem]
+ %endif
+-    call h264_idct_add8_mmx2_plane
++    call h264_idct_add8_mmxext_plane
+     mov          r5, 32
+     add          r2, 384
+ %if ARCH_X86_64
+@@ -680,12 +682,12 @@ cglobal h264_idct_add8_8_mmx2, 5, 8 + npicregs, 0, dst1, block_offset, block, st
+ %else
+     add        r0mp, gprsize
+ %endif
+-    call h264_idct_add8_mmx2_plane
++    call h264_idct_add8_mmxext_plane
+     RET
+ 
+ INIT_MMX
+ ; r0 = uint8_t *dst, r2 = int16_t *block, r3 = int stride, r6=clobbered
+-h264_idct_dc_add8_mmx2:
++h264_idct_dc_add8_mmxext:
+     movd         m0, [r2   ]          ;  0 0 X D
+     punpcklwd    m0, [r2+32]          ;  x X d D
+     paddsw       m0, [pw_32]
+@@ -779,7 +781,7 @@ cglobal h264_idct_add16_8_sse2, 5, 5 + ARCH_X86_64, 8
+ %else
+     add         r0, r0m
+ %endif
+-    call        h264_idct_dc_add8_mmx2
++    call        h264_idct_dc_add8_mmxext
+ .cycle%1end:
+ %if %1 < 7
+     add         r2, 64
+@@ -828,7 +830,7 @@ cglobal h264_idct_add16intra_8_sse2, 5, 7 + ARCH_X86_64, 8
+     mov         r0, [r0]
+     add         r0, dword [r1+(%1&1)*8+64*(1+(%1>>1))]
+ %endif
+-    call        h264_idct_dc_add8_mmx2
++    call        h264_idct_dc_add8_mmxext
+ .cycle%1end:
+ %if %1 == 1
+     add         r2, 384+64
+diff --git a/libavcodec/x86/h264_idct_10bit.asm b/libavcodec/x86/h264_idct_10bit.asm
+index b3b7df9..51965f0 100644
+--- a/libavcodec/x86/h264_idct_10bit.asm
++++ b/libavcodec/x86/h264_idct_10bit.asm
+@@ -178,7 +178,7 @@ IDCT_ADD16_10
+     mova [%1+%3  ], m4
+ %endmacro
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ cglobal h264_idct_dc_add_10,3,3
+     movd      m0, [r1]
+     paddd     m0, [pd_32]
+diff --git a/libavcodec/x86/h264_intrapred.asm b/libavcodec/x86/h264_intrapred.asm
+index 8faaaf4..c687249 100644
+--- a/libavcodec/x86/h264_intrapred.asm
++++ b/libavcodec/x86/h264_intrapred.asm
+@@ -120,7 +120,7 @@ cglobal pred16x16_horizontal_8, 2,3
+ 
+ INIT_MMX mmx
+ PRED16x16_H
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ PRED16x16_H
+ INIT_XMM ssse3
+ PRED16x16_H
+@@ -180,7 +180,7 @@ cglobal pred16x16_dc_8, 2,7
+     REP_RET
+ %endmacro
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ PRED16x16_DC
+ INIT_XMM sse2
+ PRED16x16_DC
+@@ -229,7 +229,7 @@ cglobal pred16x16_tm_vp8_8, 2,5
+ 
+ INIT_MMX mmx
+ PRED16x16_TM
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ PRED16x16_TM
+ 
+ INIT_XMM sse2
+@@ -309,14 +309,14 @@ cglobal pred16x16_plane_%1_8, 2,9,7
+     movhlps      m1, m0
+ %endif
+     paddw        m0, m1
+-%if cpuflag(mmx2)
++%if cpuflag(mmxext)
+     PSHUFLW      m1, m0, 0xE
+ %elif cpuflag(mmx)
+     mova         m1, m0
+     psrlq        m1, 32
+ %endif
+     paddw        m0, m1
+-%if cpuflag(mmx2)
++%if cpuflag(mmxext)
+     PSHUFLW      m1, m0, 0x1
+ %elif cpuflag(mmx)
+     mova         m1, m0
+@@ -536,7 +536,7 @@ INIT_MMX mmx
+ H264_PRED16x16_PLANE h264
+ H264_PRED16x16_PLANE rv40
+ H264_PRED16x16_PLANE svq3
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ H264_PRED16x16_PLANE h264
+ H264_PRED16x16_PLANE rv40
+ H264_PRED16x16_PLANE svq3
+@@ -582,7 +582,7 @@ cglobal pred8x8_plane_8, 2,9,7
+     paddw        m0, m1
+ 
+ %if notcpuflag(ssse3)
+-%if cpuflag(mmx2)
++%if cpuflag(mmxext)
+     PSHUFLW      m1, m0, 0xE
+ %elif cpuflag(mmx)
+     mova         m1, m0
+@@ -591,7 +591,7 @@ cglobal pred8x8_plane_8, 2,9,7
+     paddw        m0, m1
+ %endif ; !ssse3
+ 
+-%if cpuflag(mmx2)
++%if cpuflag(mmxext)
+     PSHUFLW      m1, m0, 0x1
+ %elif cpuflag(mmx)
+     mova         m1, m0
+@@ -716,7 +716,7 @@ ALIGN 16
+ 
+ INIT_MMX mmx
+ H264_PRED8x8_PLANE
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ H264_PRED8x8_PLANE
+ INIT_XMM sse2
+ H264_PRED8x8_PLANE
+@@ -763,7 +763,7 @@ cglobal pred8x8_horizontal_8, 2,3
+ 
+ INIT_MMX mmx
+ PRED8x8_H
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ PRED8x8_H
+ INIT_MMX ssse3
+ PRED8x8_H
+@@ -941,7 +941,7 @@ cglobal pred8x8_tm_vp8_8, 2,6
+ 
+ INIT_MMX mmx
+ PRED8x8_TM
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ PRED8x8_TM
+ 
+ INIT_XMM sse2
+@@ -2442,7 +2442,7 @@ cglobal pred4x4_tm_vp8_8, 3,6
+     sub       r3d, r4d
+     movd      mm2, r1d
+     movd      mm4, r3d
+-%if cpuflag(mmx2)
++%if cpuflag(mmxext)
+     pshufw    mm2, mm2, 0
+     pshufw    mm4, mm4, 0
+ %else
+@@ -2465,7 +2465,7 @@ cglobal pred4x4_tm_vp8_8, 3,6
+ 
+ INIT_MMX mmx
+ PRED4x4_TM
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ PRED4x4_TM
+ 
+ INIT_XMM ssse3
+diff --git a/libavcodec/x86/h264_intrapred_10bit.asm b/libavcodec/x86/h264_intrapred_10bit.asm
+index eae45ae..1b7974b 100644
+--- a/libavcodec/x86/h264_intrapred_10bit.asm
++++ b/libavcodec/x86/h264_intrapred_10bit.asm
+@@ -182,7 +182,7 @@ PRED4x4_HD
+     HADDD   %1, %2
+ %endmacro
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ cglobal pred4x4_dc_10, 3, 3
+     sub    r0, r2
+     lea    r1, [r0+r2*2]
+@@ -261,7 +261,7 @@ PRED4x4_VL
+ ;-----------------------------------------------------------------------------
+ ; void pred4x4_horizontal_up(pixel *src, const pixel *topright, int stride)
+ ;-----------------------------------------------------------------------------
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ cglobal pred4x4_horizontal_up_10, 3, 3
+     sub       r0, r2
+     lea       r1, [r0+r2*2]
+@@ -410,7 +410,7 @@ cglobal pred8x8_dc_10, 2, 6
+     RET
+ %endmacro
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ PRED8x8_DC pshufw
+ INIT_XMM sse2
+ PRED8x8_DC pshuflw
+@@ -524,7 +524,7 @@ cglobal pred8x8l_128_dc_10, 4, 4
+     RET
+ %endmacro
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ PRED8x8L_128_DC
+ INIT_XMM sse2
+ PRED8x8L_128_DC
+@@ -1007,7 +1007,7 @@ cglobal pred16x16_vertical_10, 2, 3
+     REP_RET
+ %endmacro
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ PRED16x16_VERTICAL
+ INIT_XMM sse2
+ PRED16x16_VERTICAL
+@@ -1031,7 +1031,7 @@ cglobal pred16x16_horizontal_10, 2, 3
+     REP_RET
+ %endmacro
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ PRED16x16_HORIZONTAL
+ INIT_XMM sse2
+ PRED16x16_HORIZONTAL
+@@ -1077,7 +1077,7 @@ cglobal pred16x16_dc_10, 2, 6
+     REP_RET
+ %endmacro
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ PRED16x16_DC
+ INIT_XMM sse2
+ PRED16x16_DC
+@@ -1109,7 +1109,7 @@ cglobal pred16x16_top_dc_10, 2, 3
+     REP_RET
+ %endmacro
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ PRED16x16_TOP_DC
+ INIT_XMM sse2
+ PRED16x16_TOP_DC
+@@ -1146,7 +1146,7 @@ cglobal pred16x16_left_dc_10, 2, 6
+     REP_RET
+ %endmacro
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ PRED16x16_LEFT_DC
+ INIT_XMM sse2
+ PRED16x16_LEFT_DC
+@@ -1167,7 +1167,7 @@ cglobal pred16x16_128_dc_10, 2,3
+     REP_RET
+ %endmacro
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ PRED16x16_128_DC
+ INIT_XMM sse2
+ PRED16x16_128_DC
+diff --git a/libavcodec/x86/h264_intrapred_init.c b/libavcodec/x86/h264_intrapred_init.c
+index eebd137..454dd3f 100644
+--- a/libavcodec/x86/h264_intrapred_init.c
++++ b/libavcodec/x86/h264_intrapred_init.c
+@@ -27,7 +27,7 @@ void ff_pred4x4_ ## TYPE ## _ ## DEPTH ## _ ## OPT (uint8_t *src, \
+                                                     const uint8_t *topright, \
+                                                     ptrdiff_t stride);
+ 
+-PRED4x4(dc, 10, mmx2)
++PRED4x4(dc, 10, mmxext)
+ PRED4x4(down_left, 10, sse2)
+ PRED4x4(down_left, 10, avx)
+ PRED4x4(down_right, 10, sse2)
+@@ -38,7 +38,7 @@ PRED4x4(vertical_left, 10, avx)
+ PRED4x4(vertical_right, 10, sse2)
+ PRED4x4(vertical_right, 10, ssse3)
+ PRED4x4(vertical_right, 10, avx)
+-PRED4x4(horizontal_up, 10, mmx2)
++PRED4x4(horizontal_up, 10, mmxext)
+ PRED4x4(horizontal_down, 10, sse2)
+ PRED4x4(horizontal_down, 10, ssse3)
+ PRED4x4(horizontal_down, 10, avx)
+@@ -47,7 +47,7 @@ PRED4x4(horizontal_down, 10, avx)
+ void ff_pred8x8_ ## TYPE ## _ ## DEPTH ## _ ## OPT (uint8_t *src, \
+                                                     ptrdiff_t stride);
+ 
+-PRED8x8(dc, 10, mmx2)
++PRED8x8(dc, 10, mmxext)
+ PRED8x8(dc, 10, sse2)
+ PRED8x8(top_dc, 10, sse2)
+ PRED8x8(plane, 10, sse2)
+@@ -62,7 +62,7 @@ void ff_pred8x8l_ ## TYPE ## _ ## DEPTH ## _ ## OPT (uint8_t *src, \
+ 
+ PRED8x8L(dc, 10, sse2)
+ PRED8x8L(dc, 10, avx)
+-PRED8x8L(128_dc, 10, mmx2)
++PRED8x8L(128_dc, 10, mmxext)
+ PRED8x8L(128_dc, 10, sse2)
+ PRED8x8L(top_dc, 10, sse2)
+ PRED8x8L(top_dc, 10, avx)
+@@ -88,42 +88,42 @@ PRED8x8L(horizontal_up, 10, avx)
+ void ff_pred16x16_ ## TYPE ## _ ## DEPTH ## _ ## OPT (uint8_t *src, \
+                                                       ptrdiff_t stride);
+ 
+-PRED16x16(dc, 10, mmx2)
++PRED16x16(dc, 10, mmxext)
+ PRED16x16(dc, 10, sse2)
+-PRED16x16(top_dc, 10, mmx2)
++PRED16x16(top_dc, 10, mmxext)
+ PRED16x16(top_dc, 10, sse2)
+-PRED16x16(128_dc, 10, mmx2)
++PRED16x16(128_dc, 10, mmxext)
+ PRED16x16(128_dc, 10, sse2)
+-PRED16x16(left_dc, 10, mmx2)
++PRED16x16(left_dc, 10, mmxext)
+ PRED16x16(left_dc, 10, sse2)
+-PRED16x16(vertical, 10, mmx2)
++PRED16x16(vertical, 10, mmxext)
+ PRED16x16(vertical, 10, sse2)
+-PRED16x16(horizontal, 10, mmx2)
++PRED16x16(horizontal, 10, mmxext)
+ PRED16x16(horizontal, 10, sse2)
+ 
+ /* 8-bit versions */
+ PRED16x16(vertical, 8, mmx)
+ PRED16x16(vertical, 8, sse)
+ PRED16x16(horizontal, 8, mmx)
+-PRED16x16(horizontal, 8, mmx2)
++PRED16x16(horizontal, 8, mmxext)
+ PRED16x16(horizontal, 8, ssse3)
+-PRED16x16(dc, 8, mmx2)
++PRED16x16(dc, 8, mmxext)
+ PRED16x16(dc, 8, sse2)
+ PRED16x16(dc, 8, ssse3)
+ PRED16x16(plane_h264, 8, mmx)
+-PRED16x16(plane_h264, 8, mmx2)
++PRED16x16(plane_h264, 8, mmxext)
+ PRED16x16(plane_h264, 8, sse2)
+ PRED16x16(plane_h264, 8, ssse3)
+ PRED16x16(plane_rv40, 8, mmx)
+-PRED16x16(plane_rv40, 8, mmx2)
++PRED16x16(plane_rv40, 8, mmxext)
+ PRED16x16(plane_rv40, 8, sse2)
+ PRED16x16(plane_rv40, 8, ssse3)
+ PRED16x16(plane_svq3, 8, mmx)
+-PRED16x16(plane_svq3, 8, mmx2)
++PRED16x16(plane_svq3, 8, mmxext)
+ PRED16x16(plane_svq3, 8, sse2)
+ PRED16x16(plane_svq3, 8, ssse3)
+ PRED16x16(tm_vp8, 8, mmx)
+-PRED16x16(tm_vp8, 8, mmx2)
++PRED16x16(tm_vp8, 8, mmxext)
+ PRED16x16(tm_vp8, 8, sse2)
+ 
+ PRED8x8(top_dc, 8, mmxext)
+@@ -131,14 +131,14 @@ PRED8x8(dc_rv40, 8, mmxext)
+ PRED8x8(dc, 8, mmxext)
+ PRED8x8(vertical, 8, mmx)
+ PRED8x8(horizontal, 8, mmx)
+-PRED8x8(horizontal, 8, mmx2)
++PRED8x8(horizontal, 8, mmxext)
+ PRED8x8(horizontal, 8, ssse3)
+ PRED8x8(plane, 8, mmx)
+-PRED8x8(plane, 8, mmx2)
++PRED8x8(plane, 8, mmxext)
+ PRED8x8(plane, 8, sse2)
+ PRED8x8(plane, 8, ssse3)
+ PRED8x8(tm_vp8, 8, mmx)
+-PRED8x8(tm_vp8, 8, mmx2)
++PRED8x8(tm_vp8, 8, mmxext)
+ PRED8x8(tm_vp8, 8, sse2)
+ PRED8x8(tm_vp8, 8, ssse3)
+ 
+@@ -175,7 +175,7 @@ PRED4x4(vertical_right, 8, mmxext)
+ PRED4x4(horizontal_up, 8, mmxext)
+ PRED4x4(horizontal_down, 8, mmxext)
+ PRED4x4(tm_vp8, 8, mmx)
+-PRED4x4(tm_vp8, 8, mmx2)
++PRED4x4(tm_vp8, 8, mmxext)
+ PRED4x4(tm_vp8, 8, ssse3)
+ PRED4x4(vertical_vp8, 8, mmxext)
+ 
+@@ -210,10 +210,10 @@ void ff_h264_pred_init_x86(H264PredContext *h, int codec_id, const int bit_depth
+         }
+ 
+         if (EXTERNAL_MMXEXT(mm_flags)) {
+-            h->pred16x16[HOR_PRED8x8            ] = ff_pred16x16_horizontal_8_mmx2;
+-            h->pred16x16[DC_PRED8x8             ] = ff_pred16x16_dc_8_mmx2;
++            h->pred16x16[HOR_PRED8x8            ] = ff_pred16x16_horizontal_8_mmxext;
++            h->pred16x16[DC_PRED8x8             ] = ff_pred16x16_dc_8_mmxext;
+             if (chroma_format_idc == 1)
+-                h->pred8x8[HOR_PRED8x8          ] = ff_pred8x8_horizontal_8_mmx2;
++                h->pred8x8[HOR_PRED8x8          ] = ff_pred8x8_horizontal_8_mmxext;
+             h->pred8x8l [TOP_DC_PRED            ] = ff_pred8x8l_top_dc_8_mmxext;
+             h->pred8x8l [DC_PRED                ] = ff_pred8x8l_dc_8_mmxext;
+             h->pred8x8l [HOR_PRED               ] = ff_pred8x8l_horizontal_8_mmxext;
+@@ -243,20 +243,20 @@ void ff_h264_pred_init_x86(H264PredContext *h, int codec_id, const int bit_depth
+                 }
+             }
+             if (codec_id == AV_CODEC_ID_VP8) {
+-                h->pred16x16[PLANE_PRED8x8      ] = ff_pred16x16_tm_vp8_8_mmx2;
++                h->pred16x16[PLANE_PRED8x8      ] = ff_pred16x16_tm_vp8_8_mmxext;
+                 h->pred8x8  [DC_PRED8x8         ] = ff_pred8x8_dc_rv40_8_mmxext;
+-                h->pred8x8  [PLANE_PRED8x8      ] = ff_pred8x8_tm_vp8_8_mmx2;
+-                h->pred4x4  [TM_VP8_PRED        ] = ff_pred4x4_tm_vp8_8_mmx2;
++                h->pred8x8  [PLANE_PRED8x8      ] = ff_pred8x8_tm_vp8_8_mmxext;
++                h->pred4x4  [TM_VP8_PRED        ] = ff_pred4x4_tm_vp8_8_mmxext;
+                 h->pred4x4  [VERT_PRED          ] = ff_pred4x4_vertical_vp8_8_mmxext;
+             } else {
+                 if (chroma_format_idc == 1)
+-                    h->pred8x8  [PLANE_PRED8x8] = ff_pred8x8_plane_8_mmx2;
++                    h->pred8x8  [PLANE_PRED8x8] = ff_pred8x8_plane_8_mmxext;
+                 if (codec_id == AV_CODEC_ID_SVQ3) {
+-                    h->pred16x16[PLANE_PRED8x8  ] = ff_pred16x16_plane_svq3_8_mmx2;
++                    h->pred16x16[PLANE_PRED8x8  ] = ff_pred16x16_plane_svq3_8_mmxext;
+                 } else if (codec_id == AV_CODEC_ID_RV40) {
+-                    h->pred16x16[PLANE_PRED8x8  ] = ff_pred16x16_plane_rv40_8_mmx2;
++                    h->pred16x16[PLANE_PRED8x8  ] = ff_pred16x16_plane_rv40_8_mmxext;
+                 } else {
+-                    h->pred16x16[PLANE_PRED8x8  ] = ff_pred16x16_plane_h264_8_mmx2;
++                    h->pred16x16[PLANE_PRED8x8  ] = ff_pred16x16_plane_h264_8_mmxext;
+                 }
+             }
+         }
+@@ -320,20 +320,20 @@ void ff_h264_pred_init_x86(H264PredContext *h, int codec_id, const int bit_depth
+         }
+     } else if (bit_depth == 10) {
+         if (EXTERNAL_MMXEXT(mm_flags)) {
+-            h->pred4x4[DC_PRED             ] = ff_pred4x4_dc_10_mmx2;
+-            h->pred4x4[HOR_UP_PRED         ] = ff_pred4x4_horizontal_up_10_mmx2;
++            h->pred4x4[DC_PRED             ] = ff_pred4x4_dc_10_mmxext;
++            h->pred4x4[HOR_UP_PRED         ] = ff_pred4x4_horizontal_up_10_mmxext;
+ 
+             if (chroma_format_idc == 1)
+-                h->pred8x8[DC_PRED8x8      ] = ff_pred8x8_dc_10_mmx2;
++                h->pred8x8[DC_PRED8x8      ] = ff_pred8x8_dc_10_mmxext;
+ 
+-            h->pred8x8l[DC_128_PRED        ] = ff_pred8x8l_128_dc_10_mmx2;
++            h->pred8x8l[DC_128_PRED        ] = ff_pred8x8l_128_dc_10_mmxext;
+ 
+-            h->pred16x16[DC_PRED8x8        ] = ff_pred16x16_dc_10_mmx2;
+-            h->pred16x16[TOP_DC_PRED8x8    ] = ff_pred16x16_top_dc_10_mmx2;
+-            h->pred16x16[DC_128_PRED8x8    ] = ff_pred16x16_128_dc_10_mmx2;
+-            h->pred16x16[LEFT_DC_PRED8x8   ] = ff_pred16x16_left_dc_10_mmx2;
+-            h->pred16x16[VERT_PRED8x8      ] = ff_pred16x16_vertical_10_mmx2;
+-            h->pred16x16[HOR_PRED8x8       ] = ff_pred16x16_horizontal_10_mmx2;
++            h->pred16x16[DC_PRED8x8        ] = ff_pred16x16_dc_10_mmxext;
++            h->pred16x16[TOP_DC_PRED8x8    ] = ff_pred16x16_top_dc_10_mmxext;
++            h->pred16x16[DC_128_PRED8x8    ] = ff_pred16x16_128_dc_10_mmxext;
++            h->pred16x16[LEFT_DC_PRED8x8   ] = ff_pred16x16_left_dc_10_mmxext;
++            h->pred16x16[VERT_PRED8x8      ] = ff_pred16x16_vertical_10_mmxext;
++            h->pred16x16[HOR_PRED8x8       ] = ff_pred16x16_horizontal_10_mmxext;
+         }
+         if (EXTERNAL_SSE2(mm_flags)) {
+             h->pred4x4[DIAG_DOWN_LEFT_PRED ] = ff_pred4x4_down_left_10_sse2;
+diff --git a/libavcodec/x86/h264_weight.asm b/libavcodec/x86/h264_weight.asm
+index bc3fb4b..46f5ddb 100644
+--- a/libavcodec/x86/h264_weight.asm
++++ b/libavcodec/x86/h264_weight.asm
+@@ -71,7 +71,7 @@ SECTION .text
+ %endmacro
+ 
+ INIT_MMX
+-cglobal h264_weight_16_mmx2, 6, 6, 0
++cglobal h264_weight_16_mmxext, 6, 6, 0
+     WEIGHT_SETUP
+ .nextrow:
+     WEIGHT_OP 0,  4
+@@ -96,7 +96,7 @@ cglobal h264_weight_%1_%3, 6, 6, %2
+ %endmacro
+ 
+ INIT_MMX
+-WEIGHT_FUNC_MM  8, 0, mmx2
++WEIGHT_FUNC_MM  8, 0, mmxext
+ INIT_XMM
+ WEIGHT_FUNC_MM 16, 8, sse2
+ 
+@@ -121,7 +121,7 @@ cglobal h264_weight_%1_%3, 6, 6, %2
+ %endmacro
+ 
+ INIT_MMX
+-WEIGHT_FUNC_HALF_MM 4, 0, mmx2
++WEIGHT_FUNC_HALF_MM 4, 0, mmxext
+ INIT_XMM
+ WEIGHT_FUNC_HALF_MM 8, 8, sse2
+ 
+@@ -175,7 +175,7 @@ WEIGHT_FUNC_HALF_MM 8, 8, sse2
+ %endmacro
+ 
+ INIT_MMX
+-cglobal h264_biweight_16_mmx2, 7, 8, 0
++cglobal h264_biweight_16_mmxext, 7, 8, 0
+     BIWEIGHT_SETUP
+     movifnidn r3d, r3m
+ .nextrow:
+@@ -210,7 +210,7 @@ cglobal h264_biweight_%1_%3, 7, 8, %2
+ %endmacro
+ 
+ INIT_MMX
+-BIWEIGHT_FUNC_MM  8, 0, mmx2
++BIWEIGHT_FUNC_MM  8, 0, mmxext
+ INIT_XMM
+ BIWEIGHT_FUNC_MM 16, 8, sse2
+ 
+@@ -239,7 +239,7 @@ cglobal h264_biweight_%1_%3, 7, 8, %2
+ %endmacro
+ 
+ INIT_MMX
+-BIWEIGHT_FUNC_HALF_MM 4, 0, mmx2
++BIWEIGHT_FUNC_HALF_MM 4, 0, mmxext
+ INIT_XMM
+ BIWEIGHT_FUNC_HALF_MM 8, 8, sse2
+ 
+diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c
+index 913c362..d7257e6 100644
+--- a/libavcodec/x86/h264dsp_init.c
++++ b/libavcodec/x86/h264dsp_init.c
+@@ -33,9 +33,9 @@ void ff_h264_idct ## NUM ## _add_ ## DEPTH ## _ ## OPT(uint8_t *dst,    \
+ 
+ IDCT_ADD_FUNC(, 8, mmx)
+ IDCT_ADD_FUNC(, 10, sse2)
+-IDCT_ADD_FUNC(_dc, 8, mmx2)
+-IDCT_ADD_FUNC(_dc, 10, mmx2)
+-IDCT_ADD_FUNC(8_dc, 8, mmx2)
++IDCT_ADD_FUNC(_dc, 8, mmxext)
++IDCT_ADD_FUNC(_dc, 10, mmxext)
++IDCT_ADD_FUNC(8_dc, 8, mmxext)
+ IDCT_ADD_FUNC(8_dc, 10, sse2)
+ IDCT_ADD_FUNC(8, 8, mmx)
+ IDCT_ADD_FUNC(8, 8, sse2)
+@@ -51,16 +51,16 @@ void ff_h264_idct ## NUM ## _add ## REP ## _ ## DEPTH ## _ ## OPT       \
+      DCTELEM *block, int stride, const uint8_t nnzc[6 * 8]);
+ 
+ IDCT_ADD_REP_FUNC(8, 4, 8, mmx)
+-IDCT_ADD_REP_FUNC(8, 4, 8, mmx2)
++IDCT_ADD_REP_FUNC(8, 4, 8, mmxext)
+ IDCT_ADD_REP_FUNC(8, 4, 8, sse2)
+ IDCT_ADD_REP_FUNC(8, 4, 10, sse2)
+ IDCT_ADD_REP_FUNC(8, 4, 10, avx)
+ IDCT_ADD_REP_FUNC(, 16, 8, mmx)
+-IDCT_ADD_REP_FUNC(, 16, 8, mmx2)
++IDCT_ADD_REP_FUNC(, 16, 8, mmxext)
+ IDCT_ADD_REP_FUNC(, 16, 8, sse2)
+ IDCT_ADD_REP_FUNC(, 16, 10, sse2)
+ IDCT_ADD_REP_FUNC(, 16intra, 8, mmx)
+-IDCT_ADD_REP_FUNC(, 16intra, 8, mmx2)
++IDCT_ADD_REP_FUNC(, 16intra, 8, mmxext)
+ IDCT_ADD_REP_FUNC(, 16intra, 8, sse2)
+ IDCT_ADD_REP_FUNC(, 16intra, 10, sse2)
+ IDCT_ADD_REP_FUNC(, 16, 10, avx)
+@@ -73,7 +73,7 @@ void ff_h264_idct ## NUM ## _add ## REP ## _ ## DEPTH ## _ ## OPT     \
+      DCTELEM *block, int stride, const uint8_t nnzc[6 * 8]);
+ 
+ IDCT_ADD_REP_FUNC2(, 8, 8, mmx)
+-IDCT_ADD_REP_FUNC2(, 8, 8, mmx2)
++IDCT_ADD_REP_FUNC2(, 8, 8, mmxext)
+ IDCT_ADD_REP_FUNC2(, 8, 8, sse2)
+ IDCT_ADD_REP_FUNC2(, 8, 10, sse2)
+ IDCT_ADD_REP_FUNC2(, 8, 10, avx)
+@@ -84,10 +84,11 @@ void ff_h264_luma_dc_dequant_idct_sse2(DCTELEM *output, DCTELEM *input, int qmul
+ /***********************************/
+ /* deblocking */
+ 
+-void ff_h264_loop_filter_strength_mmx2(int16_t bS[2][4][4], uint8_t nnz[40],
+-                                       int8_t ref[2][40], int16_t mv[2][40][2],
+-                                       int bidir, int edges, int step,
+-                                       int mask_mv0, int mask_mv1, int field);
++void ff_h264_loop_filter_strength_mmxext(int16_t bS[2][4][4], uint8_t nnz[40],
++                                         int8_t ref[2][40],
++                                         int16_t mv[2][40][2],
++                                         int bidir, int edges, int step,
++                                         int mask_mv0, int mask_mv1, int field);
+ 
+ #define LF_FUNC(DIR, TYPE, DEPTH, OPT)                                        \
+ void ff_deblock_ ## DIR ## _ ## TYPE ## _ ## DEPTH ## _ ## OPT(uint8_t *pix,  \
+@@ -102,12 +103,12 @@ void ff_deblock_ ## DIR ## _ ## TYPE ## _ ## DEPTH ## _ ## OPT(uint8_t *pix,  \
+                                                                int beta);
+ 
+ #define LF_FUNCS(type, depth)                   \
+-LF_FUNC(h,  chroma,       depth, mmx2)          \
+-LF_IFUNC(h, chroma_intra, depth, mmx2)          \
+-LF_FUNC(v,  chroma,       depth, mmx2)          \
+-LF_IFUNC(v, chroma_intra, depth, mmx2)          \
+-LF_FUNC(h,  luma,         depth, mmx2)          \
+-LF_IFUNC(h, luma_intra,   depth, mmx2)          \
++LF_FUNC(h,  chroma,       depth, mmxext)        \
++LF_IFUNC(h, chroma_intra, depth, mmxext)        \
++LF_FUNC(v,  chroma,       depth, mmxext)        \
++LF_IFUNC(v, chroma_intra, depth, mmxext)        \
++LF_FUNC(h,  luma,         depth, mmxext)        \
++LF_IFUNC(h, luma_intra,   depth, mmxext)        \
+ LF_FUNC(h,  luma,         depth, sse2)          \
+ LF_IFUNC(h, luma_intra,   depth, sse2)          \
+ LF_FUNC(v,  luma,         depth, sse2)          \
+@@ -129,26 +130,26 @@ LF_FUNCS(uint8_t,   8)
+ LF_FUNCS(uint16_t, 10)
+ 
+ #if ARCH_X86_32
+-LF_FUNC(v8, luma, 8, mmx2)
++LF_FUNC(v8, luma, 8, mmxext)
+ static void ff_deblock_v_luma_8_mmxext(uint8_t *pix, int stride, int alpha,
+                                        int beta, int8_t *tc0)
+ {
+     if ((tc0[0] & tc0[1]) >= 0)
+-        ff_deblock_v8_luma_8_mmx2(pix + 0, stride, alpha, beta, tc0);
++        ff_deblock_v8_luma_8_mmxext(pix + 0, stride, alpha, beta, tc0);
+     if ((tc0[2] & tc0[3]) >= 0)
+-        ff_deblock_v8_luma_8_mmx2(pix + 8, stride, alpha, beta, tc0 + 2);
++        ff_deblock_v8_luma_8_mmxext(pix + 8, stride, alpha, beta, tc0 + 2);
+ }
+-LF_IFUNC(v8, luma_intra, 8, mmx2)
++LF_IFUNC(v8, luma_intra, 8, mmxext)
+ static void ff_deblock_v_luma_intra_8_mmxext(uint8_t *pix, int stride,
+                                              int alpha, int beta)
+ {
+-    ff_deblock_v8_luma_intra_8_mmx2(pix + 0, stride, alpha, beta);
+-    ff_deblock_v8_luma_intra_8_mmx2(pix + 8, stride, alpha, beta);
++    ff_deblock_v8_luma_intra_8_mmxext(pix + 0, stride, alpha, beta);
++    ff_deblock_v8_luma_intra_8_mmxext(pix + 8, stride, alpha, beta);
+ }
+ #endif /* ARCH_X86_32 */
+ 
+-LF_FUNC(v,  luma,       10, mmx2)
+-LF_IFUNC(v, luma_intra, 10, mmx2)
++LF_FUNC(v,  luma,       10, mmxext)
++LF_IFUNC(v, luma_intra, 10, mmxext)
+ 
+ /***********************************/
+ /* weighted prediction */
+@@ -165,8 +166,8 @@ void ff_h264_biweight_ ## W ## _ ## OPT(uint8_t *dst, uint8_t *src,     \
+                                         int weights, int offset);
+ 
+ #define H264_BIWEIGHT_MMX(W)                    \
+-    H264_WEIGHT(W, mmx2)                        \
+-    H264_BIWEIGHT(W, mmx2)
++    H264_WEIGHT(W, mmxext)                      \
++    H264_BIWEIGHT(W, mmxext)
+ 
+ #define H264_BIWEIGHT_MMX_SSE(W)                \
+     H264_BIWEIGHT_MMX(W)                        \
+@@ -212,7 +213,7 @@ void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth,
+     int mm_flags = av_get_cpu_flags();
+ 
+     if (chroma_format_idc == 1 && EXTERNAL_MMXEXT(mm_flags))
+-        c->h264_loop_filter_strength = ff_h264_loop_filter_strength_mmx2;
++        c->h264_loop_filter_strength = ff_h264_loop_filter_strength_mmxext;
+ 
+     if (bit_depth == 8) {
+         if (EXTERNAL_MMX(mm_flags)) {
+@@ -230,33 +231,33 @@ void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth,
+                 c->h264_luma_dc_dequant_idct = ff_h264_luma_dc_dequant_idct_mmx;
+ 
+             if (EXTERNAL_MMXEXT(mm_flags)) {
+-                c->h264_idct_dc_add  = ff_h264_idct_dc_add_8_mmx2;
+-                c->h264_idct8_dc_add = ff_h264_idct8_dc_add_8_mmx2;
+-                c->h264_idct_add16   = ff_h264_idct_add16_8_mmx2;
+-                c->h264_idct8_add4   = ff_h264_idct8_add4_8_mmx2;
++                c->h264_idct_dc_add  = ff_h264_idct_dc_add_8_mmxext;
++                c->h264_idct8_dc_add = ff_h264_idct8_dc_add_8_mmxext;
++                c->h264_idct_add16   = ff_h264_idct_add16_8_mmxext;
++                c->h264_idct8_add4   = ff_h264_idct8_add4_8_mmxext;
+                 if (chroma_format_idc == 1)
+-                    c->h264_idct_add8 = ff_h264_idct_add8_8_mmx2;
+-                c->h264_idct_add16intra = ff_h264_idct_add16intra_8_mmx2;
++                    c->h264_idct_add8 = ff_h264_idct_add8_8_mmxext;
++                c->h264_idct_add16intra = ff_h264_idct_add16intra_8_mmxext;
+ 
+-                c->h264_v_loop_filter_chroma       = ff_deblock_v_chroma_8_mmx2;
+-                c->h264_v_loop_filter_chroma_intra = ff_deblock_v_chroma_intra_8_mmx2;
++                c->h264_v_loop_filter_chroma       = ff_deblock_v_chroma_8_mmxext;
++                c->h264_v_loop_filter_chroma_intra = ff_deblock_v_chroma_intra_8_mmxext;
+                 if (chroma_format_idc == 1) {
+-                    c->h264_h_loop_filter_chroma       = ff_deblock_h_chroma_8_mmx2;
+-                    c->h264_h_loop_filter_chroma_intra = ff_deblock_h_chroma_intra_8_mmx2;
++                    c->h264_h_loop_filter_chroma       = ff_deblock_h_chroma_8_mmxext;
++                    c->h264_h_loop_filter_chroma_intra = ff_deblock_h_chroma_intra_8_mmxext;
+                 }
+ #if ARCH_X86_32
+                 c->h264_v_loop_filter_luma       = ff_deblock_v_luma_8_mmxext;
+-                c->h264_h_loop_filter_luma       = ff_deblock_h_luma_8_mmx2;
++                c->h264_h_loop_filter_luma       = ff_deblock_h_luma_8_mmxext;
+                 c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_8_mmxext;
+-                c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_8_mmx2;
++                c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_8_mmxext;
+ #endif /* ARCH_X86_32 */
+-                c->weight_h264_pixels_tab[0] = ff_h264_weight_16_mmx2;
+-                c->weight_h264_pixels_tab[1] = ff_h264_weight_8_mmx2;
+-                c->weight_h264_pixels_tab[2] = ff_h264_weight_4_mmx2;
++                c->weight_h264_pixels_tab[0] = ff_h264_weight_16_mmxext;
++                c->weight_h264_pixels_tab[1] = ff_h264_weight_8_mmxext;
++                c->weight_h264_pixels_tab[2] = ff_h264_weight_4_mmxext;
+ 
+-                c->biweight_h264_pixels_tab[0] = ff_h264_biweight_16_mmx2;
+-                c->biweight_h264_pixels_tab[1] = ff_h264_biweight_8_mmx2;
+-                c->biweight_h264_pixels_tab[2] = ff_h264_biweight_4_mmx2;
++                c->biweight_h264_pixels_tab[0] = ff_h264_biweight_16_mmxext;
++                c->biweight_h264_pixels_tab[1] = ff_h264_biweight_8_mmxext;
++                c->biweight_h264_pixels_tab[2] = ff_h264_biweight_4_mmxext;
+ 
+                 if (EXTERNAL_SSE2(mm_flags)) {
+                     c->h264_idct8_add  = ff_h264_idct8_add_8_sse2;
+@@ -297,14 +298,14 @@ void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth,
+         if (EXTERNAL_MMX(mm_flags)) {
+             if (EXTERNAL_MMXEXT(mm_flags)) {
+ #if ARCH_X86_32
+-                c->h264_v_loop_filter_chroma       = ff_deblock_v_chroma_10_mmx2;
+-                c->h264_v_loop_filter_chroma_intra = ff_deblock_v_chroma_intra_10_mmx2;
+-                c->h264_v_loop_filter_luma         = ff_deblock_v_luma_10_mmx2;
+-                c->h264_h_loop_filter_luma         = ff_deblock_h_luma_10_mmx2;
+-                c->h264_v_loop_filter_luma_intra   = ff_deblock_v_luma_intra_10_mmx2;
+-                c->h264_h_loop_filter_luma_intra   = ff_deblock_h_luma_intra_10_mmx2;
++                c->h264_v_loop_filter_chroma       = ff_deblock_v_chroma_10_mmxext;
++                c->h264_v_loop_filter_chroma_intra = ff_deblock_v_chroma_intra_10_mmxext;
++                c->h264_v_loop_filter_luma         = ff_deblock_v_luma_10_mmxext;
++                c->h264_h_loop_filter_luma         = ff_deblock_h_luma_10_mmxext;
++                c->h264_v_loop_filter_luma_intra   = ff_deblock_v_luma_intra_10_mmxext;
++                c->h264_h_loop_filter_luma_intra   = ff_deblock_h_luma_intra_10_mmxext;
+ #endif /* ARCH_X86_32 */
+-                c->h264_idct_dc_add = ff_h264_idct_dc_add_10_mmx2;
++                c->h264_idct_dc_add = ff_h264_idct_dc_add_10_mmxext;
+                 if (EXTERNAL_SSE2(mm_flags)) {
+                     c->h264_idct_add     = ff_h264_idct_add_10_sse2;
+                     c->h264_idct8_dc_add = ff_h264_idct8_dc_add_10_sse2;
+diff --git a/libavcodec/x86/pngdsp.asm b/libavcodec/x86/pngdsp.asm
+index 1573363..c05f3da 100644
+--- a/libavcodec/x86/pngdsp.asm
++++ b/libavcodec/x86/pngdsp.asm
+@@ -166,7 +166,7 @@ cglobal add_png_paeth_prediction, 5, 7, %1, dst, src, top, w, bpp, end, cntr
+     RET
+ %endmacro
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ ADD_PAETH_PRED_FN 0
+ 
+ INIT_MMX ssse3
+diff --git a/libavcodec/x86/pngdsp_init.c b/libavcodec/x86/pngdsp_init.c
+index 213b854..2e858fa 100644
+--- a/libavcodec/x86/pngdsp_init.c
++++ b/libavcodec/x86/pngdsp_init.c
+@@ -23,8 +23,8 @@
+ #include "libavutil/x86/cpu.h"
+ #include "libavcodec/pngdsp.h"
+ 
+-void ff_add_png_paeth_prediction_mmx2 (uint8_t *dst, uint8_t *src,
+-                                       uint8_t *top, int w, int bpp);
++void ff_add_png_paeth_prediction_mmxext(uint8_t *dst, uint8_t *src,
++                                        uint8_t *top, int w, int bpp);
+ void ff_add_png_paeth_prediction_ssse3(uint8_t *dst, uint8_t *src,
+                                        uint8_t *top, int w, int bpp);
+ void ff_add_bytes_l2_mmx (uint8_t *dst, uint8_t *src1,
+@@ -41,7 +41,7 @@ void ff_pngdsp_init_x86(PNGDSPContext *dsp)
+         dsp->add_bytes_l2         = ff_add_bytes_l2_mmx;
+ #endif
+     if (EXTERNAL_MMXEXT(flags))
+-        dsp->add_paeth_prediction = ff_add_png_paeth_prediction_mmx2;
++        dsp->add_paeth_prediction = ff_add_png_paeth_prediction_mmxext;
+     if (EXTERNAL_SSE2(flags))
+         dsp->add_bytes_l2         = ff_add_bytes_l2_sse2;
+     if (EXTERNAL_SSSE3(flags))
+diff --git a/libavcodec/x86/rv34dsp.asm b/libavcodec/x86/rv34dsp.asm
+index 2f12446..c099ac5 100644
+--- a/libavcodec/x86/rv34dsp.asm
++++ b/libavcodec/x86/rv34dsp.asm
+@@ -57,7 +57,7 @@ cglobal rv34_idct_%1, 1, 2, 0
+     REP_RET
+ %endmacro
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ %define IDCT_DC IDCT_DC_ROUND
+ rv34_idct dc
+ %define IDCT_DC IDCT_DC_NOROUND
+@@ -133,7 +133,7 @@ cglobal rv34_idct_dc_add, 3, 3
+     mova        mm5, [pd_512]           ; 0x200
+ %endmacro
+ 
+-; ff_rv34_idct_add_mmx2(uint8_t *dst, ptrdiff_t stride, DCTELEM *block);
++; ff_rv34_idct_add_mmxext(uint8_t *dst, ptrdiff_t stride, DCTELEM *block);
+ %macro COL_TRANSFORM  4
+     pshufw      mm3, %2, 0xDD        ; col. 1,3,1,3
+     pshufw       %2, %2, 0x88        ; col. 0,2,0,2
+@@ -154,7 +154,7 @@ cglobal rv34_idct_dc_add, 3, 3
+     packuswb     %2, %2
+     movd         %1, %2
+ %endmacro
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ cglobal rv34_idct_add, 3,3,0, d, s, b
+     ROW_TRANSFORM       bq
+     COL_TRANSFORM     [dq], mm0, [pw_col_coeffs+ 0], [pw_col_coeffs+ 8]
+diff --git a/libavcodec/x86/rv34dsp_init.c b/libavcodec/x86/rv34dsp_init.c
+index 305745a..6b6cf91 100644
+--- a/libavcodec/x86/rv34dsp_init.c
++++ b/libavcodec/x86/rv34dsp_init.c
+@@ -25,11 +25,11 @@
+ #include "libavcodec/dsputil.h"
+ #include "libavcodec/rv34dsp.h"
+ 
+-void ff_rv34_idct_dc_mmx2(DCTELEM *block);
+-void ff_rv34_idct_dc_noround_mmx2(DCTELEM *block);
++void ff_rv34_idct_dc_mmxext(DCTELEM *block);
++void ff_rv34_idct_dc_noround_mmxext(DCTELEM *block);
+ void ff_rv34_idct_dc_add_mmx(uint8_t *dst, ptrdiff_t stride, int dc);
+ void ff_rv34_idct_dc_add_sse4(uint8_t *dst, ptrdiff_t stride, int dc);
+-void ff_rv34_idct_add_mmx2(uint8_t *dst, ptrdiff_t stride, DCTELEM *block);
++void ff_rv34_idct_add_mmxext(uint8_t *dst, ptrdiff_t stride, DCTELEM *block);
+ 
+ av_cold void ff_rv34dsp_init_x86(RV34DSPContext* c, DSPContext *dsp)
+ {
+@@ -38,8 +38,8 @@ av_cold void ff_rv34dsp_init_x86(RV34DSPContext* c, DSPContext *dsp)
+     if (EXTERNAL_MMX(mm_flags))
+         c->rv34_idct_dc_add = ff_rv34_idct_dc_add_mmx;
+     if (EXTERNAL_MMXEXT(mm_flags)) {
+-        c->rv34_inv_transform_dc = ff_rv34_idct_dc_noround_mmx2;
+-        c->rv34_idct_add         = ff_rv34_idct_add_mmx2;
++        c->rv34_inv_transform_dc = ff_rv34_idct_dc_noround_mmxext;
++        c->rv34_idct_add         = ff_rv34_idct_add_mmxext;
+     }
+     if (EXTERNAL_SSE4(mm_flags))
+         c->rv34_idct_dc_add = ff_rv34_idct_dc_add_sse4;
+diff --git a/libavcodec/x86/rv40dsp.asm b/libavcodec/x86/rv40dsp.asm
+index 02267ef..7ec72be 100644
+--- a/libavcodec/x86/rv40dsp.asm
++++ b/libavcodec/x86/rv40dsp.asm
+@@ -240,7 +240,7 @@ INIT_MMX  mmx
+ FILTER_V  put
+ FILTER_H  put
+ 
+-INIT_MMX  mmx2
++INIT_MMX  mmxext
+ FILTER_V  avg
+ FILTER_H  avg
+ 
+@@ -486,7 +486,7 @@ cglobal rv40_weight_func_%1_%2, 6, 7, 8
+     REP_RET
+ %endmacro
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ RV40_WEIGHT   rnd,    8, 3
+ RV40_WEIGHT   rnd,   16, 4
+ RV40_WEIGHT   nornd,  8, 3
+diff --git a/libavcodec/x86/rv40dsp_init.c b/libavcodec/x86/rv40dsp_init.c
+index a7d92f7..a1dc22a 100644
+--- a/libavcodec/x86/rv40dsp_init.c
++++ b/libavcodec/x86/rv40dsp_init.c
+@@ -34,15 +34,15 @@
+ #if HAVE_YASM
+ void ff_put_rv40_chroma_mc8_mmx  (uint8_t *dst, uint8_t *src,
+                                   int stride, int h, int x, int y);
+-void ff_avg_rv40_chroma_mc8_mmx2 (uint8_t *dst, uint8_t *src,
+-                                  int stride, int h, int x, int y);
++void ff_avg_rv40_chroma_mc8_mmxext(uint8_t *dst, uint8_t *src,
++                                   int stride, int h, int x, int y);
+ void ff_avg_rv40_chroma_mc8_3dnow(uint8_t *dst, uint8_t *src,
+                                   int stride, int h, int x, int y);
+ 
+ void ff_put_rv40_chroma_mc4_mmx  (uint8_t *dst, uint8_t *src,
+                                   int stride, int h, int x, int y);
+-void ff_avg_rv40_chroma_mc4_mmx2 (uint8_t *dst, uint8_t *src,
+-                                  int stride, int h, int x, int y);
++void ff_avg_rv40_chroma_mc4_mmxext(uint8_t *dst, uint8_t *src,
++                                   int stride, int h, int x, int y);
+ void ff_avg_rv40_chroma_mc4_3dnow(uint8_t *dst, uint8_t *src,
+                                   int stride, int h, int x, int y);
+ 
+@@ -55,7 +55,7 @@ void ff_rv40_weight_func_nornd_16_##opt(uint8_t *dst, uint8_t *src1, uint8_t *sr
+                                         int w1, int w2, ptrdiff_t stride); \
+ void ff_rv40_weight_func_nornd_8_##opt (uint8_t *dst, uint8_t *src1, uint8_t *src2, \
+                                         int w1, int w2, ptrdiff_t stride);
+-DECLARE_WEIGHT(mmx2)
++DECLARE_WEIGHT(mmxext)
+ DECLARE_WEIGHT(sse2)
+ DECLARE_WEIGHT(ssse3)
+ 
+@@ -150,9 +150,9 @@ QPEL_MC_DECL(avg_, _sse2)
+ 
+ QPEL_MC_DECL(put_, _mmx)
+ 
+-#define ff_put_rv40_qpel_h_mmx2  ff_put_rv40_qpel_h_mmx
+-#define ff_put_rv40_qpel_v_mmx2  ff_put_rv40_qpel_v_mmx
+-QPEL_MC_DECL(avg_, _mmx2)
++#define ff_put_rv40_qpel_h_mmxext  ff_put_rv40_qpel_h_mmx
++#define ff_put_rv40_qpel_v_mmxext  ff_put_rv40_qpel_v_mmx
++QPEL_MC_DECL(avg_, _mmxext)
+ 
+ #define ff_put_rv40_qpel_h_3dnow  ff_put_rv40_qpel_h_mmx
+ #define ff_put_rv40_qpel_v_3dnow  ff_put_rv40_qpel_v_mmx
+@@ -206,14 +206,14 @@ void ff_rv40dsp_init_x86(RV34DSPContext *c, DSPContext *dsp)
+ #endif
+     }
+     if (EXTERNAL_MMXEXT(mm_flags)) {
+-        c->avg_chroma_pixels_tab[0] = ff_avg_rv40_chroma_mc8_mmx2;
+-        c->avg_chroma_pixels_tab[1] = ff_avg_rv40_chroma_mc4_mmx2;
+-        c->rv40_weight_pixels_tab[0][0] = ff_rv40_weight_func_rnd_16_mmx2;
+-        c->rv40_weight_pixels_tab[0][1] = ff_rv40_weight_func_rnd_8_mmx2;
+-        c->rv40_weight_pixels_tab[1][0] = ff_rv40_weight_func_nornd_16_mmx2;
+-        c->rv40_weight_pixels_tab[1][1] = ff_rv40_weight_func_nornd_8_mmx2;
++        c->avg_chroma_pixels_tab[0]     = ff_avg_rv40_chroma_mc8_mmxext;
++        c->avg_chroma_pixels_tab[1]     = ff_avg_rv40_chroma_mc4_mmxext;
++        c->rv40_weight_pixels_tab[0][0] = ff_rv40_weight_func_rnd_16_mmxext;
++        c->rv40_weight_pixels_tab[0][1] = ff_rv40_weight_func_rnd_8_mmxext;
++        c->rv40_weight_pixels_tab[1][0] = ff_rv40_weight_func_nornd_16_mmxext;
++        c->rv40_weight_pixels_tab[1][1] = ff_rv40_weight_func_nornd_8_mmxext;
+ #if ARCH_X86_32
+-        QPEL_MC_SET(avg_, _mmx2)
++        QPEL_MC_SET(avg_, _mmxext)
+ #endif
+     } else if (EXTERNAL_AMD3DNOW(mm_flags)) {
+         c->avg_chroma_pixels_tab[0] = ff_avg_rv40_chroma_mc8_3dnow;
+diff --git a/libavcodec/x86/vc1dsp_init.c b/libavcodec/x86/vc1dsp_init.c
+index c359c4a..230d06f 100644
+--- a/libavcodec/x86/vc1dsp_init.c
++++ b/libavcodec/x86/vc1dsp_init.c
+@@ -64,8 +64,8 @@ static void vc1_h_loop_filter16_sse4(uint8_t *src, int stride, int pq)
+ 
+ void ff_put_vc1_chroma_mc8_nornd_mmx  (uint8_t *dst, uint8_t *src,
+                                        int stride, int h, int x, int y);
+-void ff_avg_vc1_chroma_mc8_nornd_mmx2 (uint8_t *dst, uint8_t *src,
+-                                       int stride, int h, int x, int y);
++void ff_avg_vc1_chroma_mc8_nornd_mmxext(uint8_t *dst, uint8_t *src,
++                                        int stride, int h, int x, int y);
+ void ff_avg_vc1_chroma_mc8_nornd_3dnow(uint8_t *dst, uint8_t *src,
+                                        int stride, int h, int x, int y);
+ void ff_put_vc1_chroma_mc8_nornd_ssse3(uint8_t *dst, uint8_t *src,
+@@ -99,7 +99,7 @@ av_cold void ff_vc1dsp_init_x86(VC1DSPContext *dsp)
+ 
+     if (mm_flags & AV_CPU_FLAG_MMXEXT) {
+         ASSIGN_LF(mmxext);
+-        dsp->avg_no_rnd_vc1_chroma_pixels_tab[0] = ff_avg_vc1_chroma_mc8_nornd_mmx2;
++        dsp->avg_no_rnd_vc1_chroma_pixels_tab[0] = ff_avg_vc1_chroma_mc8_nornd_mmxext;
+     } else if (mm_flags & AV_CPU_FLAG_3DNOW) {
+         dsp->avg_no_rnd_vc1_chroma_pixels_tab[0] = ff_avg_vc1_chroma_mc8_nornd_3dnow;
+     }
+diff --git a/libavcodec/x86/vp3dsp.asm b/libavcodec/x86/vp3dsp.asm
+index d300304..fc1e776 100644
+--- a/libavcodec/x86/vp3dsp.asm
++++ b/libavcodec/x86/vp3dsp.asm
+@@ -101,7 +101,7 @@ SECTION .text
+     mov  [r0+r3  -1], r2w
+ %endmacro
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ cglobal vp3_v_loop_filter, 3, 4
+ %if ARCH_X86_64
+     movsxd        r1, r1d
+@@ -633,7 +633,7 @@ vp3_idct_funcs
+     movq   [r0+r3  ], m5
+ %endmacro
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ cglobal vp3_idct_dc_add, 3, 4
+ %if ARCH_X86_64
+     movsxd        r1, r1d
+diff --git a/libavcodec/x86/vp3dsp_init.c b/libavcodec/x86/vp3dsp_init.c
+index d91050e..bbe74ba 100644
+--- a/libavcodec/x86/vp3dsp_init.c
++++ b/libavcodec/x86/vp3dsp_init.c
+@@ -31,11 +31,13 @@ void ff_vp3_idct_add_mmx(uint8_t *dest, int line_size, DCTELEM *block);
+ void ff_vp3_idct_put_sse2(uint8_t *dest, int line_size, DCTELEM *block);
+ void ff_vp3_idct_add_sse2(uint8_t *dest, int line_size, DCTELEM *block);
+ 
+-void ff_vp3_idct_dc_add_mmx2(uint8_t *dest, int line_size,
+-                             const DCTELEM *block);
++void ff_vp3_idct_dc_add_mmxext(uint8_t *dest, int line_size,
++                               const DCTELEM *block);
+ 
+-void ff_vp3_v_loop_filter_mmx2(uint8_t *src, int stride, int *bounding_values);
+-void ff_vp3_h_loop_filter_mmx2(uint8_t *src, int stride, int *bounding_values);
++void ff_vp3_v_loop_filter_mmxext(uint8_t *src, int stride,
++                                 int *bounding_values);
++void ff_vp3_h_loop_filter_mmxext(uint8_t *src, int stride,
++                                 int *bounding_values);
+ 
+ av_cold void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags)
+ {
+@@ -50,11 +52,11 @@ av_cold void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags)
+ #endif
+ 
+     if (EXTERNAL_MMXEXT(cpuflags)) {
+-        c->idct_dc_add = ff_vp3_idct_dc_add_mmx2;
++        c->idct_dc_add = ff_vp3_idct_dc_add_mmxext;
+ 
+         if (!(flags & CODEC_FLAG_BITEXACT)) {
+-            c->v_loop_filter = ff_vp3_v_loop_filter_mmx2;
+-            c->h_loop_filter = ff_vp3_h_loop_filter_mmx2;
++            c->v_loop_filter = ff_vp3_v_loop_filter_mmxext;
++            c->h_loop_filter = ff_vp3_h_loop_filter_mmxext;
+         }
+     }
+ 
+diff --git a/libavcodec/x86/vp8dsp.asm b/libavcodec/x86/vp8dsp.asm
+index 5dc4ca3..d732bf4 100644
+--- a/libavcodec/x86/vp8dsp.asm
++++ b/libavcodec/x86/vp8dsp.asm
+@@ -338,7 +338,7 @@ INIT_XMM ssse3
+ FILTER_SSSE3 8
+ 
+ ; 4x4 block, H-only 4-tap filter
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ cglobal put_vp8_epel4_h4, 6, 6 + npicregs, 0, dst, dststride, src, srcstride, height, mx, picreg
+     shl       mxd, 4
+ %ifdef PIC
+@@ -386,7 +386,7 @@ cglobal put_vp8_epel4_h4, 6, 6 + npicregs, 0, dst, dststride, src, srcstride, he
+     REP_RET
+ 
+ ; 4x4 block, H-only 6-tap filter
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ cglobal put_vp8_epel4_h6, 6, 6 + npicregs, 0, dst, dststride, src, srcstride, height, mx, picreg
+     lea       mxd, [mxq*3]
+ %ifdef PIC
+@@ -673,7 +673,7 @@ cglobal put_vp8_epel%1_v6, 7, 7, 8, dst, dststride, src, srcstride, height, picr
+     REP_RET
+ %endmacro
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ FILTER_V 4
+ INIT_XMM sse2
+ FILTER_V 8
+@@ -769,7 +769,7 @@ cglobal put_vp8_bilinear%1_h, 6, 6 + npicregs, 7, dst, dststride, src, srcstride
+     REP_RET
+ %endmacro
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ FILTER_BILINEAR 4
+ INIT_XMM sse2
+ FILTER_BILINEAR 8
+@@ -1611,7 +1611,7 @@ cglobal vp8_%1_loop_filter_simple, 3, %2, 8, dst, stride, flim, cntr
+ INIT_MMX mmx
+ SIMPLE_LOOPFILTER v, 4
+ SIMPLE_LOOPFILTER h, 5
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ SIMPLE_LOOPFILTER v, 4
+ SIMPLE_LOOPFILTER h, 5
+ %endif
+@@ -1835,7 +1835,7 @@ cglobal vp8_%1_loop_filter16y_inner, 5, 5, 13, dst, stride, flimE, flimI, hevthr
+     psubusb          m6, m5          ; q2-q1
+     por              m6, m4          ; abs(q2-q1)
+ 
+-%if notcpuflag(mmx2)
++%if notcpuflag(mmxext)
+     mova             m4, m_flimI
+     pxor             m3, m3
+     psubusb          m0, m4
+@@ -1875,7 +1875,7 @@ cglobal vp8_%1_loop_filter16y_inner, 5, 5, 13, dst, stride, flimE, flimI, hevthr
+     psubusb          m1, m3          ; p1-p0
+     psubusb          m6, m2          ; p0-p1
+     por              m1, m6          ; abs(p1-p0)
+-%if notcpuflag(mmx2)
++%if notcpuflag(mmxext)
+     mova             m6, m1
+     psubusb          m1, m4
+     psubusb          m6, m_hevthr
+@@ -1906,7 +1906,7 @@ cglobal vp8_%1_loop_filter16y_inner, 5, 5, 13, dst, stride, flimE, flimI, hevthr
+     psubusb          m1, m5          ; q0-q1
+     psubusb          m7, m4          ; q1-q0
+     por              m1, m7          ; abs(q1-q0)
+-%if notcpuflag(mmx2)
++%if notcpuflag(mmxext)
+     mova             m7, m1
+     psubusb          m1, m6
+     psubusb          m7, m_hevthr
+@@ -2014,14 +2014,14 @@ cglobal vp8_%1_loop_filter16y_inner, 5, 5, 13, dst, stride, flimE, flimI, hevthr
+ %else
+     mova             m6, m_maskres
+ %endif
+-%if notcpuflag(mmx2)
++%if notcpuflag(mmxext)
+     mova             m7, [pb_1]
+ %else ; mmxext/sse2
+     pxor             m7, m7
+ %endif
+     pand             m0, m6
+     pand             m1, m6
+-%if notcpuflag(mmx2)
++%if notcpuflag(mmxext)
+     paddusb          m0, m7
+     pand             m1, [pb_FE]
+     pandn            m7, m0
+@@ -2097,7 +2097,7 @@ INNER_LOOPFILTER h, 16
+ INNER_LOOPFILTER v,  8
+ INNER_LOOPFILTER h,  8
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ INNER_LOOPFILTER v, 16
+ INNER_LOOPFILTER h, 16
+ INNER_LOOPFILTER v,  8
+@@ -2343,7 +2343,7 @@ cglobal vp8_%1_loop_filter16y_mbedge, 5, 5, 15, dst1, stride, flimE, flimI, hevt
+     psubusb          m6, m5          ; q2-q1
+     por              m6, m4          ; abs(q2-q1)
+ 
+-%if notcpuflag(mmx2)
++%if notcpuflag(mmxext)
+     mova             m4, m_flimI
+     pxor             m3, m3
+     psubusb          m0, m4
+@@ -2383,7 +2383,7 @@ cglobal vp8_%1_loop_filter16y_mbedge, 5, 5, 15, dst1, stride, flimE, flimI, hevt
+     psubusb          m1, m3          ; p1-p0
+     psubusb          m6, m2          ; p0-p1
+     por              m1, m6          ; abs(p1-p0)
+-%if notcpuflag(mmx2)
++%if notcpuflag(mmxext)
+     mova             m6, m1
+     psubusb          m1, m4
+     psubusb          m6, m_hevthr
+@@ -2414,7 +2414,7 @@ cglobal vp8_%1_loop_filter16y_mbedge, 5, 5, 15, dst1, stride, flimE, flimI, hevt
+     psubusb          m1, m5          ; q0-q1
+     psubusb          m7, m4          ; q1-q0
+     por              m1, m7          ; abs(q1-q0)
+-%if notcpuflag(mmx2)
++%if notcpuflag(mmxext)
+     mova             m7, m1
+     psubusb          m1, m6
+     psubusb          m7, m_hevthr
+@@ -2755,7 +2755,7 @@ MBEDGE_LOOPFILTER h, 16
+ MBEDGE_LOOPFILTER v,  8
+ MBEDGE_LOOPFILTER h,  8
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ MBEDGE_LOOPFILTER v, 16
+ MBEDGE_LOOPFILTER h, 16
+ MBEDGE_LOOPFILTER v,  8
+diff --git a/libavcodec/x86/vp8dsp_init.c b/libavcodec/x86/vp8dsp_init.c
+index 38ad0c7..bf5463f 100644
+--- a/libavcodec/x86/vp8dsp_init.c
++++ b/libavcodec/x86/vp8dsp_init.c
+@@ -30,16 +30,16 @@
+ /*
+  * MC functions
+  */
+-extern void ff_put_vp8_epel4_h4_mmx2  (uint8_t *dst, ptrdiff_t dststride,
++extern void ff_put_vp8_epel4_h4_mmxext(uint8_t *dst, ptrdiff_t dststride,
+                                        uint8_t *src, ptrdiff_t srcstride,
+                                        int height, int mx, int my);
+-extern void ff_put_vp8_epel4_h6_mmx2  (uint8_t *dst, ptrdiff_t dststride,
++extern void ff_put_vp8_epel4_h6_mmxext(uint8_t *dst, ptrdiff_t dststride,
+                                        uint8_t *src, ptrdiff_t srcstride,
+                                        int height, int mx, int my);
+-extern void ff_put_vp8_epel4_v4_mmx2  (uint8_t *dst, ptrdiff_t dststride,
++extern void ff_put_vp8_epel4_v4_mmxext(uint8_t *dst, ptrdiff_t dststride,
+                                        uint8_t *src, ptrdiff_t srcstride,
+                                        int height, int mx, int my);
+-extern void ff_put_vp8_epel4_v6_mmx2  (uint8_t *dst, ptrdiff_t dststride,
++extern void ff_put_vp8_epel4_v6_mmxext(uint8_t *dst, ptrdiff_t dststride,
+                                        uint8_t *src, ptrdiff_t srcstride,
+                                        int height, int mx, int my);
+ 
+@@ -81,7 +81,7 @@ extern void ff_put_vp8_epel8_v6_ssse3 (uint8_t *dst, ptrdiff_t dststride,
+                                        uint8_t *src, ptrdiff_t srcstride,
+                                        int height, int mx, int my);
+ 
+-extern void ff_put_vp8_bilinear4_h_mmx2  (uint8_t *dst, ptrdiff_t dststride,
++extern void ff_put_vp8_bilinear4_h_mmxext(uint8_t *dst, ptrdiff_t dststride,
+                                           uint8_t *src, ptrdiff_t srcstride,
+                                           int height, int mx, int my);
+ extern void ff_put_vp8_bilinear8_h_sse2  (uint8_t *dst, ptrdiff_t dststride,
+@@ -94,7 +94,7 @@ extern void ff_put_vp8_bilinear8_h_ssse3 (uint8_t *dst, ptrdiff_t dststride,
+                                           uint8_t *src, ptrdiff_t srcstride,
+                                           int height, int mx, int my);
+ 
+-extern void ff_put_vp8_bilinear4_v_mmx2  (uint8_t *dst, ptrdiff_t dststride,
++extern void ff_put_vp8_bilinear4_v_mmxext(uint8_t *dst, ptrdiff_t dststride,
+                                           uint8_t *src, ptrdiff_t srcstride,
+                                           int height, int mx, int my);
+ extern void ff_put_vp8_bilinear8_v_sse2  (uint8_t *dst, ptrdiff_t dststride,
+@@ -140,16 +140,16 @@ static void ff_put_vp8_ ## FILTERTYPE ## 8_ ## TAPTYPE ## _ ## OPT( \
+ }
+ 
+ #if ARCH_X86_32
+-TAP_W8 (mmx2,  epel, h4)
+-TAP_W8 (mmx2,  epel, h6)
+-TAP_W16(mmx2,  epel, h6)
+-TAP_W8 (mmx2,  epel, v4)
+-TAP_W8 (mmx2,  epel, v6)
+-TAP_W16(mmx2,  epel, v6)
+-TAP_W8 (mmx2,  bilinear, h)
+-TAP_W16(mmx2,  bilinear, h)
+-TAP_W8 (mmx2,  bilinear, v)
+-TAP_W16(mmx2,  bilinear, v)
++TAP_W8 (mmxext, epel, h4)
++TAP_W8 (mmxext, epel, h6)
++TAP_W16(mmxext, epel, h6)
++TAP_W8 (mmxext, epel, v4)
++TAP_W8 (mmxext, epel, v6)
++TAP_W16(mmxext, epel, v6)
++TAP_W8 (mmxext, bilinear, h)
++TAP_W16(mmxext, bilinear, h)
++TAP_W8 (mmxext, bilinear, v)
++TAP_W16(mmxext, bilinear, v)
+ #endif
+ 
+ TAP_W16(sse2,  epel, h6)
+@@ -178,13 +178,13 @@ static void ff_put_vp8_epel ## SIZE ## _h ## TAPNUMX ## v ## TAPNUMY ## _ ## OPT
+ 
+ #if ARCH_X86_32
+ #define HVTAPMMX(x, y) \
+-HVTAP(mmx2, 8, x, y,  4,  8) \
+-HVTAP(mmx2, 8, x, y,  8, 16)
++HVTAP(mmxext, 8, x, y,  4,  8) \
++HVTAP(mmxext, 8, x, y,  8, 16)
+ 
+-HVTAP(mmx2, 8, 6, 6, 16, 16)
++HVTAP(mmxext, 8, 6, 6, 16, 16)
+ #else
+ #define HVTAPMMX(x, y) \
+-HVTAP(mmx2, 8, x, y,  4,  8)
++HVTAP(mmxext, 8, x, y,  4,  8)
+ #endif
+ 
+ HVTAPMMX(4, 4)
+@@ -219,10 +219,10 @@ static void ff_put_vp8_bilinear ## SIZE ## _hv_ ## OPT( \
+         dst, dststride, tmp, SIZE,      height,     mx, my); \
+ }
+ 
+-HVBILIN(mmx2,  8,  4,  8)
++HVBILIN(mmxext,  8,  4,  8)
+ #if ARCH_X86_32
+-HVBILIN(mmx2,  8,  8, 16)
+-HVBILIN(mmx2,  8, 16, 16)
++HVBILIN(mmxext,  8,  8, 16)
++HVBILIN(mmxext,  8, 16, 16)
+ #endif
+ HVBILIN(sse2,  8,  8, 16)
+ HVBILIN(sse2,  8, 16, 16)
+@@ -284,7 +284,7 @@ extern void ff_vp8_h_loop_filter8uv_mbedge_ ## NAME(uint8_t *dstU, \
+                                                     int e, int i, int hvt);
+ 
+ DECLARE_LOOP_FILTER(mmx)
+-DECLARE_LOOP_FILTER(mmx2)
++DECLARE_LOOP_FILTER(mmxext)
+ DECLARE_LOOP_FILTER(sse2)
+ DECLARE_LOOP_FILTER(ssse3)
+ DECLARE_LOOP_FILTER(sse4)
+@@ -352,26 +352,26 @@ av_cold void ff_vp8dsp_init_x86(VP8DSPContext* c)
+     /* note that 4-tap width=16 functions are missing because w=16
+      * is only used for luma, and luma is always a copy or sixtap. */
+     if (mm_flags & AV_CPU_FLAG_MMXEXT) {
+-        VP8_MC_FUNC(2, 4, mmx2);
+-        VP8_BILINEAR_MC_FUNC(2, 4, mmx2);
++        VP8_MC_FUNC(2, 4, mmxext);
++        VP8_BILINEAR_MC_FUNC(2, 4, mmxext);
+ #if ARCH_X86_32
+-        VP8_LUMA_MC_FUNC(0, 16, mmx2);
+-        VP8_MC_FUNC(1, 8, mmx2);
+-        VP8_BILINEAR_MC_FUNC(0, 16, mmx2);
+-        VP8_BILINEAR_MC_FUNC(1, 8, mmx2);
+-
+-        c->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter_simple_mmx2;
+-        c->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter_simple_mmx2;
+-
+-        c->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16y_inner_mmx2;
+-        c->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16y_inner_mmx2;
+-        c->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_mmx2;
+-        c->vp8_h_loop_filter8uv_inner = ff_vp8_h_loop_filter8uv_inner_mmx2;
+-
+-        c->vp8_v_loop_filter16y       = ff_vp8_v_loop_filter16y_mbedge_mmx2;
+-        c->vp8_h_loop_filter16y       = ff_vp8_h_loop_filter16y_mbedge_mmx2;
+-        c->vp8_v_loop_filter8uv       = ff_vp8_v_loop_filter8uv_mbedge_mmx2;
+-        c->vp8_h_loop_filter8uv       = ff_vp8_h_loop_filter8uv_mbedge_mmx2;
++        VP8_LUMA_MC_FUNC(0, 16, mmxext);
++        VP8_MC_FUNC(1, 8, mmxext);
++        VP8_BILINEAR_MC_FUNC(0, 16, mmxext);
++        VP8_BILINEAR_MC_FUNC(1,  8, mmxext);
++
++        c->vp8_v_loop_filter_simple   = ff_vp8_v_loop_filter_simple_mmxext;
++        c->vp8_h_loop_filter_simple   = ff_vp8_h_loop_filter_simple_mmxext;
++
++        c->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16y_inner_mmxext;
++        c->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16y_inner_mmxext;
++        c->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_mmxext;
++        c->vp8_h_loop_filter8uv_inner = ff_vp8_h_loop_filter8uv_inner_mmxext;
++
++        c->vp8_v_loop_filter16y       = ff_vp8_v_loop_filter16y_mbedge_mmxext;
++        c->vp8_h_loop_filter16y       = ff_vp8_h_loop_filter16y_mbedge_mmxext;
++        c->vp8_v_loop_filter8uv       = ff_vp8_v_loop_filter8uv_mbedge_mmxext;
++        c->vp8_h_loop_filter8uv       = ff_vp8_h_loop_filter8uv_mbedge_mmxext;
+ #endif
+     }
+ 
+diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm
+index cf11183..40d8763 100644
+--- a/libavutil/x86/x86util.asm
++++ b/libavutil/x86/x86util.asm
+@@ -555,7 +555,7 @@
+ %if mmsize == 16
+     pshuflw    %1, %2, (%3)*0x55
+     punpcklqdq %1, %1
+-%elif cpuflag(mmx2)
++%elif cpuflag(mmxext)
+     pshufw     %1, %2, (%3)*0x55
+ %else
+     %ifnidn %1, %2
+diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm
+index 23508b8..d137e6e 100644
+--- a/libswscale/x86/output.asm
++++ b/libswscale/x86/output.asm
+@@ -247,7 +247,7 @@ cglobal yuv2planeX_%1, %3, 8, %2, filter, fltsize, src, dst, w, dither, offset
+ %endmacro
+ 
+ %if ARCH_X86_32
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ yuv2planeX_fn  8,  0, 7
+ yuv2planeX_fn  9,  0, 5
+ yuv2planeX_fn 10,  0, 5
+@@ -388,7 +388,7 @@ INIT_MMX mmx
+ yuv2plane1_fn  8, 0, 5
+ yuv2plane1_fn 16, 0, 3
+ 
+-INIT_MMX mmx2
++INIT_MMX mmxext
+ yuv2plane1_fn  9, 0, 3
+ yuv2plane1_fn 10, 0, 3
+ %endif
+diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c
+index 571510a..c48e56d 100644
+--- a/libswscale/x86/swscale.c
++++ b/libswscale/x86/swscale.c
+@@ -250,7 +250,7 @@ extern void ff_yuv2planeX_ ## size ## _ ## opt(const int16_t *filter, int filter
+     VSCALEX_FUNC(10, opt)
+ 
+ #if ARCH_X86_32
+-VSCALEX_FUNCS(mmx2);
++VSCALEX_FUNCS(mmxext);
+ #endif
+ VSCALEX_FUNCS(sse2);
+ VSCALEX_FUNCS(sse4);
+@@ -267,7 +267,7 @@ extern void ff_yuv2plane1_ ## size ## _ ## opt(const int16_t *src, uint8_t *dst,
+     VSCALE_FUNC(16, opt1)
+ 
+ #if ARCH_X86_32
+-VSCALE_FUNCS(mmx, mmx2);
++VSCALE_FUNCS(mmx, mmxext);
+ #endif
+ VSCALE_FUNCS(sse2, sse2);
+ VSCALE_FUNC(16, sse4);
+@@ -360,7 +360,7 @@ switch(c->dstBpc){ \
+     if (EXTERNAL_MMX(cpu_flags)) {
+         ASSIGN_MMX_SCALE_FUNC(c->hyScale, c->hLumFilterSize, mmx, mmx);
+         ASSIGN_MMX_SCALE_FUNC(c->hcScale, c->hChrFilterSize, mmx, mmx);
+-        ASSIGN_VSCALE_FUNC(c->yuv2plane1, mmx, mmx2, cpu_flags & AV_CPU_FLAG_MMXEXT);
++        ASSIGN_VSCALE_FUNC(c->yuv2plane1, mmx, mmxext, cpu_flags & AV_CPU_FLAG_MMXEXT);
+ 
+         switch (c->srcFormat) {
+         case AV_PIX_FMT_Y400A:
+@@ -393,7 +393,7 @@ switch(c->dstBpc){ \
+         }
+     }
+     if (EXTERNAL_MMXEXT(cpu_flags)) {
+-        ASSIGN_VSCALEX_FUNC(c->yuv2planeX, mmx2, , 1);
++        ASSIGN_VSCALEX_FUNC(c->yuv2planeX, mmxext, , 1);
+     }
+ #endif /* ARCH_X86_32 */
+ #define ASSIGN_SSE_SCALE_FUNC(hscalefn, filtersize, opt1, opt2) \
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0263-segment-fix-NULL-pointer-dereference-in-seg_write_he.patch b/debian/patches/post-9beta2/0263-segment-fix-NULL-pointer-dereference-in-seg_write_he.patch
new file mode 100644
index 0000000..b480f06
--- /dev/null
+++ b/debian/patches/post-9beta2/0263-segment-fix-NULL-pointer-dereference-in-seg_write_he.patch
@@ -0,0 +1,34 @@
+From e8769b37fe8a841c0d28d3686c6d3cdecc542bc7 Mon Sep 17 00:00:00 2001
+From: Xi Wang <xi.wang at gmail.com>
+Date: Wed, 14 Nov 2012 02:52:32 -0500
+Subject: [PATCH 263/278] segment: fix NULL pointer dereference in
+ seg_write_header()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Since the pointer `oc' is NULL, oc->oformat->name will cause a null
+pointer dereference.  This patch changes it to seg->oformat->name.
+
+Signed-off-by: Xi Wang <xi.wang at gmail.com>
+Signed-off-by: Martin Storsjö <martin at martin.st>
+---
+ libavformat/segment.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavformat/segment.c b/libavformat/segment.c
+index fd52835..8afb41f 100644
+--- a/libavformat/segment.c
++++ b/libavformat/segment.c
+@@ -210,7 +210,7 @@ static int seg_write_header(AVFormatContext *s)
+     }
+     if (seg->oformat->flags & AVFMT_NOFILE) {
+         av_log(s, AV_LOG_ERROR, "format %s not supported.\n",
+-               oc->oformat->name);
++               seg->oformat->name);
+         ret = AVERROR(EINVAL);
+         goto fail;
+     }
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0264-avutil-change-GET_UTF8-to-not-use-av_log2.patch b/debian/patches/post-9beta2/0264-avutil-change-GET_UTF8-to-not-use-av_log2.patch
new file mode 100644
index 0000000..e7717fd
--- /dev/null
+++ b/debian/patches/post-9beta2/0264-avutil-change-GET_UTF8-to-not-use-av_log2.patch
@@ -0,0 +1,42 @@
+From 7ba0c1b390a6ea67ca5e9cbade3005285b51b70f Mon Sep 17 00:00:00 2001
+From: Mans Rullgard <mans at mansr.com>
+Date: Tue, 13 Nov 2012 15:49:39 +0000
+Subject: [PATCH 264/278] avutil: change GET_UTF8 to not use av_log2()
+
+This removes an inter-library dependency on ff_log2_tab causing
+linking errors in some configurations.
+
+Signed-off-by: Mans Rullgard <mans at mansr.com>
+---
+ libavutil/common.h |    9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/libavutil/common.h b/libavutil/common.h
+index 3465863..cc4df16 100644
+--- a/libavutil/common.h
++++ b/libavutil/common.h
+@@ -252,16 +252,17 @@ static av_always_inline av_const int av_popcount64_c(uint64_t x)
+ #define GET_UTF8(val, GET_BYTE, ERROR)\
+     val= GET_BYTE;\
+     {\
+-        int ones= 7 - av_log2(val ^ 255);\
+-        if(ones==1)\
++        uint32_t top = (val & 128) >> 1;\
++        if ((val & 0xc0) == 0x80)\
+             ERROR\
+-        val&= 127>>ones;\
+-        while(--ones > 0){\
++        while (val & top) {\
+             int tmp= GET_BYTE - 128;\
+             if(tmp>>6)\
+                 ERROR\
+             val= (val<<6) + tmp;\
++            top <<= 5;\
+         }\
++        val &= (top << 1) - 1;\
+     }
+ 
+ /**
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0265-ppc-do-not-pass-redundant-compiler-flags.patch b/debian/patches/post-9beta2/0265-ppc-do-not-pass-redundant-compiler-flags.patch
new file mode 100644
index 0000000..dfe0930
--- /dev/null
+++ b/debian/patches/post-9beta2/0265-ppc-do-not-pass-redundant-compiler-flags.patch
@@ -0,0 +1,47 @@
+From 7f1fcaf0e6488c92c0624ab112ec220dc3709de6 Mon Sep 17 00:00:00 2001
+From: Mans Rullgard <mans at mansr.com>
+Date: Wed, 14 Nov 2012 00:07:13 +0000
+Subject: [PATCH 265/278] ppc: do not pass redundant compiler flags
+
+The -mpowerpc64 and -mpowerpc-gfxopt flags are implicitly set by
+-mcpu as needed.  Passing them explicitly is redundant and can
+conflict with user-supplied flags.
+
+Signed-off-by: Mans Rullgard <mans at mansr.com>
+---
+ configure |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure b/configure
+index 163b742..779b733 100755
+--- a/configure
++++ b/configure
+@@ -2505,20 +2505,20 @@ elif enabled ppc; then
+             disable altivec
+         ;;
+         g3|75*|ppc75*|powerpc75*)
+-            cpuflags="-mcpu=750 -mpowerpc-gfxopt"
++            cpuflags="-mcpu=750"
+             disable altivec
+         ;;
+         g4|745*|ppc745*|powerpc745*)
+-            cpuflags="-mcpu=7450 -mpowerpc-gfxopt"
++            cpuflags="-mcpu=7450"
+         ;;
+         74*|ppc74*|powerpc74*)
+-            cpuflags="-mcpu=7400 -mpowerpc-gfxopt"
++            cpuflags="-mcpu=7400"
+         ;;
+         g5|970|ppc970|powerpc970)
+-            cpuflags="-mcpu=970 -mpowerpc-gfxopt -mpowerpc64"
++            cpuflags="-mcpu=970"
+         ;;
+         power[3-7]*)
+-            cpuflags="-mcpu=$cpu -mpowerpc-gfxopt -mpowerpc64"
++            cpuflags="-mcpu=$cpu"
+         ;;
+         cell)
+             cpuflags="-mcpu=cell"
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0266-fate-Add-dependencies-for-aac-alac-amrnb-amrwb-atrac.patch b/debian/patches/post-9beta2/0266-fate-Add-dependencies-for-aac-alac-amrnb-amrwb-atrac.patch
new file mode 100644
index 0000000..563e746
--- /dev/null
+++ b/debian/patches/post-9beta2/0266-fate-Add-dependencies-for-aac-alac-amrnb-amrwb-atrac.patch
@@ -0,0 +1,111 @@
+From a3138ebfa85ec0d3aa7cbf8f2a09e40a220521cf Mon Sep 17 00:00:00 2001
+From: Diego Biurrun <diego at biurrun.de>
+Date: Sat, 20 Oct 2012 01:12:18 +0200
+Subject: [PATCH 266/278] fate: Add dependencies for aac, alac, amrnb, amrwb,
+ atrac tests
+
+---
+ tests/fate/aac.mak   |   11 ++++++++---
+ tests/fate/alac.mak  |    2 +-
+ tests/fate/amrnb.mak |    2 +-
+ tests/fate/amrwb.mak |    2 +-
+ tests/fate/atrac.mak |    8 +++++---
+ 5 files changed, 16 insertions(+), 9 deletions(-)
+
+diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak
+index ea738c5..e840bf0 100644
+--- a/tests/fate/aac.mak
++++ b/tests/fate/aac.mak
+@@ -53,9 +53,10 @@ fate-aac-ap05_48: REF = $(SAMPLES)/aac/ap05_48.s16
+ fate-aac-ct%: CMD = pcm -i $(SAMPLES)/aac/CT_DecoderCheck/$(@:fate-aac-ct-%=%)
+ fate-aac-ct%: REF = $(SAMPLES)/aac/CT_DecoderCheck/aacPlusv2.wav
+ 
++FATE_AAC_CT_RAW = fate-aac-ct-sbr_i-ps_i.aac
++
+ FATE_AAC_CT = sbr_bc-ps_i.3gp  \
+               sbr_bic-ps_i.3gp \
+-              sbr_i-ps_i.aac   \
+               sbr_bc-ps_bc.mp4 \
+               sbr_bc-ps_i.mp4  \
+               sbr_i-ps_bic.mp4 \
+@@ -71,7 +72,11 @@ FATE_AAC_LATM += fate-aac-latm_stereo_to_51
+ fate-aac-latm_stereo_to_51: CMD = pcm -i $(SAMPLES)/aac/latm_stereo_to_51.ts -channel_layout 5.1
+ fate-aac-latm_stereo_to_51: REF = $(SAMPLES)/aac/latm_stereo_to_51_ref.s16
+ 
+-FATE_AAC_ALL = $(FATE_AAC) $(FATE_AAC_LATM)
++FATE_AAC-$(call      DEMDEC, AAC,    AAC)      += $(FATE_AAC_CT_RAW)
++FATE_AAC-$(call      DEMDEC, MOV,    AAC)      += $(FATE_AAC)
++FATE_AAC_LATM-$(call DEMDEC, MPEGTS, AAC_LATM) += $(FATE_AAC_LATM)
++
++FATE_AAC_ALL = $(FATE_AAC-yes) $(FATE_AAC_LATM-yes)
+ 
+ $(FATE_AAC_ALL): CMP  = oneoff
+ $(FATE_AAC_ALL): FUZZ = 2
+@@ -79,4 +84,4 @@ $(FATE_AAC_ALL): FUZZ = 2
+ FATE_SAMPLES_AVCONV += $(FATE_AAC_ALL)
+ 
+ fate-aac: $(FATE_AAC_ALL)
+-fate-aac-latm: $(FATE_AAC_LATM)
++fate-aac-latm: $(FATE_AAC_LATM-yes)
+diff --git a/tests/fate/alac.mak b/tests/fate/alac.mak
+index b55b594..814a5b7 100644
+--- a/tests/fate/alac.mak
++++ b/tests/fate/alac.mak
+@@ -11,5 +11,5 @@ fate-alac-%: CMD = enc_dec_pcm mov wav s16le $(REF) -c alac $(OPTS)
+ fate-alac-%: CMP = oneoff
+ fate-alac-%: FUZZ = 0
+ 
+-FATE_SAMPLES_AVCONV += $(FATE_ALAC)
++FATE_SAMPLES_AVCONV-$(call ENCDEC, ALAC, MOV) += $(FATE_ALAC)
+ fate-alac: $(FATE_ALAC)
+diff --git a/tests/fate/amrnb.mak b/tests/fate/amrnb.mak
+index 6e3f2a4..6dbba58 100644
+--- a/tests/fate/amrnb.mak
++++ b/tests/fate/amrnb.mak
+@@ -32,5 +32,5 @@ fate-amrnb-12k2: REF = $(SAMPLES)/amrnb/12.2k.pcm
+ 
+ $(FATE_AMRNB): CMP = stddev
+ 
+-FATE_SAMPLES_AVCONV += $(FATE_AMRNB)
++FATE_SAMPLES_AVCONV-$(call DEMDEC, AMR, AMRNB) += $(FATE_AMRNB)
+ fate-amrnb: $(FATE_AMRNB)
+diff --git a/tests/fate/amrwb.mak b/tests/fate/amrwb.mak
+index 0b7be72..99c2737 100644
+--- a/tests/fate/amrwb.mak
++++ b/tests/fate/amrwb.mak
+@@ -43,5 +43,5 @@ fate-amrwb-23k85-2: REF = $(SAMPLES)/amrwb/deus-23k85.pcm
+ 
+ $(FATE_AMRWB): CMP = stddev
+ 
+-FATE_SAMPLES_AVCONV += $(FATE_AMRWB)
++FATE_SAMPLES_AVCONV-$(call DEMDEC, AMR, AMRWB) += $(FATE_AMRWB)
+ fate-amrwb: $(FATE_AMRWB)
+diff --git a/tests/fate/atrac.mak b/tests/fate/atrac.mak
+index 39b788a..3ac5553 100644
+--- a/tests/fate/atrac.mak
++++ b/tests/fate/atrac.mak
+@@ -1,4 +1,4 @@
+-FATE_ATRAC1 += fate-atrac1
++FATE_ATRAC1-$(call DEMDEC, AEA, ATRAC1) += fate-atrac1
+ fate-atrac1: CMD = pcm -i $(SAMPLES)/atrac1/test_tones_small.aea
+ fate-atrac1: REF = $(SAMPLES)/atrac1/test_tones_small.pcm
+ 
+@@ -14,11 +14,13 @@ FATE_ATRAC3 += fate-atrac3-3
+ fate-atrac3-3: CMD = pcm -i $(SAMPLES)/atrac3/mc_sich_at3_132_small.wav
+ fate-atrac3-3: REF = $(SAMPLES)/atrac3/mc_sich_at3_132_small.pcm
+ 
+-FATE_ATRAC_ALL = $(FATE_ATRAC1) $(FATE_ATRAC3)
++FATE_ATRAC3-$(call DEMDEC, WAV, ATRAC3) += $(FATE_ATRAC3)
++
++FATE_ATRAC_ALL = $(FATE_ATRAC1-yes) $(FATE_ATRAC3-yes)
+ 
+ $(FATE_ATRAC_ALL): CMP = oneoff
+ 
+ FATE_SAMPLES_AVCONV += $(FATE_ATRAC_ALL)
+ 
+ fate-atrac:  $(FATE_ATRAC_ALL)
+-fate-atrac3: $(FATE_ATRAC3)
++fate-atrac3: $(FATE_ATRAC3-yes)
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0267-avformat-clarify-stream-id-for-muxing.patch b/debian/patches/post-9beta2/0267-avformat-clarify-stream-id-for-muxing.patch
new file mode 100644
index 0000000..84a8b66
--- /dev/null
+++ b/debian/patches/post-9beta2/0267-avformat-clarify-stream-id-for-muxing.patch
@@ -0,0 +1,25 @@
+From 3b4296f41473a5b39e84d7a49d480624c9c60040 Mon Sep 17 00:00:00 2001
+From: Luca Barbato <lu_zero at gentoo.org>
+Date: Sat, 10 Nov 2012 16:20:30 +0100
+Subject: [PATCH 267/278] avformat: clarify stream id for muxing
+
+---
+ libavformat/avformat.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavformat/avformat.h b/libavformat/avformat.h
+index 3e10496..d1d4763 100644
+--- a/libavformat/avformat.h
++++ b/libavformat/avformat.h
+@@ -621,7 +621,7 @@ typedef struct AVStream {
+     /**
+      * Format-specific stream ID.
+      * decoding: set by libavformat
+-     * encoding: set by the user
++     * encoding: set by the user, replaced by libavformat if left unset
+      */
+     int id;
+     /**
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0268-rtp-set-the-payload-type-as-stream-id.patch b/debian/patches/post-9beta2/0268-rtp-set-the-payload-type-as-stream-id.patch
new file mode 100644
index 0000000..570fce9
--- /dev/null
+++ b/debian/patches/post-9beta2/0268-rtp-set-the-payload-type-as-stream-id.patch
@@ -0,0 +1,318 @@
+From 8034130e06b03859af9ce64f7ee653cd14df328d Mon Sep 17 00:00:00 2001
+From: Luca Barbato <lu_zero at gentoo.org>
+Date: Sun, 11 Nov 2012 20:44:28 +0100
+Subject: [PATCH 268/278] rtp: set the payload type as stream id
+
+Support multiple video/audio streams with different format in the
+same session.
+
+Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
+---
+ libavformat/avformat.h     |    3 +++
+ libavformat/internal.h     |    5 +++--
+ libavformat/movenc.c       |   11 +++++++----
+ libavformat/movenchint.c   |    2 +-
+ libavformat/rtp.c          |    8 ++++++--
+ libavformat/rtp.h          |    9 +++++++--
+ libavformat/rtpenc.c       |   13 +++++++++++--
+ libavformat/rtpenc_chain.c |   12 ++++++++++--
+ libavformat/rtpenc_chain.h |    3 ++-
+ libavformat/rtsp.c         |    3 ++-
+ libavformat/sapenc.c       |    2 +-
+ libavformat/sdp.c          |   21 +++++++++++++--------
+ 12 files changed, 66 insertions(+), 26 deletions(-)
+
+diff --git a/libavformat/avformat.h b/libavformat/avformat.h
+index d1d4763..51635c4 100644
+--- a/libavformat/avformat.h
++++ b/libavformat/avformat.h
+@@ -1684,6 +1684,9 @@ int av_filename_number_test(const char *filename);
+ /**
+  * Generate an SDP for an RTP session.
+  *
++ * Note, this overwrites the id values of AVStreams in the muxer contexts
++ * for getting unique dynamic payload types.
++ *
+  * @param ac array of AVFormatContexts describing the RTP streams. If the
+  *           array is composed by only one context, such context can contain
+  *           multiple AVStreams (one AVStream per RTP stream). Otherwise,
+diff --git a/libavformat/internal.h b/libavformat/internal.h
+index 3ef46ea..01e3df3 100644
+--- a/libavformat/internal.h
++++ b/libavformat/internal.h
+@@ -124,7 +124,8 @@ int ff_url_join(char *str, int size, const char *proto,
+  *
+  * @param buff the buffer to append the SDP fragment to
+  * @param size the size of the buff buffer
+- * @param c the AVCodecContext of the media to describe
++ * @param st the AVStream of the media to describe
++ * @param idx the global stream index
+  * @param dest_addr the destination address of the media stream, may be NULL
+  * @param dest_type the destination address type, may be NULL
+  * @param port the destination port of the media stream, 0 if unknown
+@@ -132,7 +133,7 @@ int ff_url_join(char *str, int size, const char *proto,
+  * @param fmt the AVFormatContext, which might contain options modifying
+  *            the generated SDP
+  */
+-void ff_sdp_write_media(char *buff, int size, AVCodecContext *c,
++void ff_sdp_write_media(char *buff, int size, AVStream *st, int idx,
+                         const char *dest_addr, const char *dest_type,
+                         int port, int ttl, AVFormatContext *fmt);
+ 
+diff --git a/libavformat/movenc.c b/libavformat/movenc.c
+index 50371cd..3949520 100644
+--- a/libavformat/movenc.c
++++ b/libavformat/movenc.c
+@@ -1536,13 +1536,16 @@ static int mov_write_uuid_tag_psp(AVIOContext *pb, MOVTrack *mov)
+     return 0x34;
+ }
+ 
+-static int mov_write_udta_sdp(AVIOContext *pb, AVFormatContext *ctx, int index)
++static int mov_write_udta_sdp(AVIOContext *pb, MOVTrack *track)
+ {
++
++    AVFormatContext *ctx = track->rtp_ctx;
+     char buf[1000] = "";
+     int len;
+ 
+-    ff_sdp_write_media(buf, sizeof(buf), ctx->streams[0]->codec, NULL, NULL, 0, 0, ctx);
+-    av_strlcatf(buf, sizeof(buf), "a=control:streamid=%d\r\n", index);
++    ff_sdp_write_media(buf, sizeof(buf), ctx->streams[0], track->src_track,
++                       NULL, NULL, 0, 0, ctx);
++    av_strlcatf(buf, sizeof(buf), "a=control:streamid=%d\r\n", track->track_id);
+     len = strlen(buf);
+ 
+     avio_wb32(pb, len + 24);
+@@ -1573,7 +1576,7 @@ static int mov_write_trak_tag(AVIOContext *pb, MOVMuxContext *mov,
+     if (track->mode == MODE_PSP)
+         mov_write_uuid_tag_psp(pb,track);  // PSP Movies require this uuid box
+     if (track->tag == MKTAG('r','t','p',' '))
+-        mov_write_udta_sdp(pb, track->rtp_ctx, track->track_id);
++        mov_write_udta_sdp(pb, track);
+     if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO && track->mode == MODE_MOV) {
+         double sample_aspect_ratio = av_q2d(st->sample_aspect_ratio);
+         if (0.0 != sample_aspect_ratio && 1.0 != sample_aspect_ratio)
+diff --git a/libavformat/movenchint.c b/libavformat/movenchint.c
+index 5ef90f1..02391b5 100644
+--- a/libavformat/movenchint.c
++++ b/libavformat/movenchint.c
+@@ -44,7 +44,7 @@ int ff_mov_init_hinting(AVFormatContext *s, int index, int src_index)
+     track->enc->codec_tag  = track->tag;
+ 
+     ret = ff_rtp_chain_mux_open(&track->rtp_ctx, s, src_st, NULL,
+-                                RTP_MAX_PACKET_SIZE);
++                                RTP_MAX_PACKET_SIZE, src_index);
+     if (ret < 0)
+         goto fail;
+ 
+diff --git a/libavformat/rtp.c b/libavformat/rtp.c
+index 4314c46..6512206 100644
+--- a/libavformat/rtp.c
++++ b/libavformat/rtp.c
+@@ -90,7 +90,8 @@ int ff_rtp_get_codec_info(AVCodecContext *codec, int payload_type)
+     return -1;
+ }
+ 
+-int ff_rtp_get_payload_type(AVFormatContext *fmt, AVCodecContext *codec)
++int ff_rtp_get_payload_type(AVFormatContext *fmt,
++                            AVCodecContext *codec, int idx)
+ {
+     int i;
+     AVOutputFormat *ofmt = fmt ? fmt->oformat : NULL;
+@@ -124,8 +125,11 @@ int ff_rtp_get_payload_type(AVFormatContext *fmt, AVCodecContext *codec)
+             return AVRtpPayloadTypes[i].pt;
+         }
+ 
++    if (idx < 0)
++        idx = codec->codec_type == AVMEDIA_TYPE_AUDIO;
++
+     /* dynamic payload type */
+-    return RTP_PT_PRIVATE + (codec->codec_type == AVMEDIA_TYPE_AUDIO);
++    return RTP_PT_PRIVATE + idx;
+ }
+ 
+ const char *ff_rtp_enc_name(int payload_type)
+diff --git a/libavformat/rtp.h b/libavformat/rtp.h
+index 6df4ed4..f8d406e 100644
+--- a/libavformat/rtp.h
++++ b/libavformat/rtp.h
+@@ -25,13 +25,18 @@
+ #include "libavcodec/avcodec.h"
+ 
+ /**
+- * Return the payload type for a given codec used in the given format context.
++ * Return the payload type for a given stream used in the given format context.
++ * Static payload types are derived from the codec.
++ * Dynamic payload type are derived from the id field in AVStream.
++ * The format context private option payload_type overrides both.
+  *
+  * @param fmt   The context of the format
+  * @param codec The context of the codec
++ * @param idx   The stream index
+  * @return The payload type (the 'PT' field in the RTP header).
+  */
+-int ff_rtp_get_payload_type(AVFormatContext *fmt, AVCodecContext *codec);
++int ff_rtp_get_payload_type(AVFormatContext *fmt, AVCodecContext *codec,
++                            int idx);
+ 
+ /**
+  * Initialize a codec context based on the payload type.
+diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
+index b17c465..babb2bb 100644
+--- a/libavformat/rtpenc.c
++++ b/libavformat/rtpenc.c
+@@ -101,8 +101,17 @@ static int rtp_write_header(AVFormatContext *s1)
+         return -1;
+     }
+ 
+-    if (s->payload_type < 0)
+-        s->payload_type = ff_rtp_get_payload_type(s1, st->codec);
++    if (s->payload_type < 0) {
++        /* Re-validate non-dynamic payload types */
++        if (st->id < RTP_PT_PRIVATE)
++            st->id = ff_rtp_get_payload_type(s1, st->codec, -1);
++
++        s->payload_type = st->id;
++    } else {
++        /* private option takes priority */
++        st->id = s->payload_type;
++    }
++
+     s->base_timestamp = av_get_random_seed();
+     s->timestamp = s->base_timestamp;
+     s->cur_timestamp = 0;
+diff --git a/libavformat/rtpenc_chain.c b/libavformat/rtpenc_chain.c
+index 3742099..adc432a 100644
+--- a/libavformat/rtpenc_chain.c
++++ b/libavformat/rtpenc_chain.c
+@@ -23,13 +23,15 @@
+ #include "avio_internal.h"
+ #include "rtpenc_chain.h"
+ #include "avio_internal.h"
++#include "rtp.h"
+ #include "libavutil/opt.h"
+ 
+ int ff_rtp_chain_mux_open(AVFormatContext **out, AVFormatContext *s,
+-                          AVStream *st, URLContext *handle, int packet_size)
++                          AVStream *st, URLContext *handle, int packet_size,
++                          int idx)
+ {
+     AVFormatContext *rtpctx = NULL;
+-    int ret;
++    int ret, pt;
+     AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL);
+     uint8_t *rtpflags;
+     AVDictionary *opts = NULL;
+@@ -57,6 +59,12 @@ int ff_rtp_chain_mux_open(AVFormatContext **out, AVFormatContext *s,
+     rtpctx->max_delay = s->max_delay;
+     /* Copy other stream parameters. */
+     rtpctx->streams[0]->sample_aspect_ratio = st->sample_aspect_ratio;
++    /* Get the payload type from the codec */
++    if (st->id < RTP_PT_PRIVATE)
++        rtpctx->streams[0]->id =
++            ff_rtp_get_payload_type(rtpctx, st->codec, idx);
++    else
++        rtpctx->streams[0]->id = st->id;
+ 
+     if (av_opt_get(s, "rtpflags", AV_OPT_SEARCH_CHILDREN, &rtpflags) >= 0)
+         av_dict_set(&opts, "rtpflags", rtpflags, AV_DICT_DONT_STRDUP_VAL);
+diff --git a/libavformat/rtpenc_chain.h b/libavformat/rtpenc_chain.h
+index 66b9e4c..4117239 100644
+--- a/libavformat/rtpenc_chain.h
++++ b/libavformat/rtpenc_chain.h
+@@ -26,6 +26,7 @@
+ #include "url.h"
+ 
+ int ff_rtp_chain_mux_open(AVFormatContext **out, AVFormatContext *s,
+-                          AVStream *st, URLContext *handle, int packet_size);
++                          AVStream *st, URLContext *handle, int packet_size,
++                          int id);
+ 
+ #endif /* AVFORMAT_RTPENC_CHAIN_H */
+diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
+index 44de4af..8142094 100644
+--- a/libavformat/rtsp.c
++++ b/libavformat/rtsp.c
+@@ -630,7 +630,8 @@ int ff_rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st)
+     if (s->oformat && CONFIG_RTSP_MUXER) {
+         int ret = ff_rtp_chain_mux_open(&rtsp_st->transport_priv, s, st,
+                                         rtsp_st->rtp_handle,
+-                                        RTSP_TCP_MAX_PACKET_SIZE);
++                                        RTSP_TCP_MAX_PACKET_SIZE,
++                                        rtsp_st->stream_index);
+         /* Ownership of rtp_handle is passed to the rtp mux context */
+         rtsp_st->rtp_handle = NULL;
+         if (ret < 0)
+diff --git a/libavformat/sapenc.c b/libavformat/sapenc.c
+index 1575848..fd9be4f 100644
+--- a/libavformat/sapenc.c
++++ b/libavformat/sapenc.c
+@@ -151,7 +151,7 @@ static int sap_write_header(AVFormatContext *s)
+             ret = AVERROR(EIO);
+             goto fail;
+         }
+-        ret = ff_rtp_chain_mux_open(&contexts[i], s, s->streams[i], fd, 0);
++        ret = ff_rtp_chain_mux_open(&contexts[i], s, s->streams[i], fd, 0, i);
+         if (ret < 0)
+             goto fail;
+         s->streams[i]->priv_data = contexts[i];
+diff --git a/libavformat/sdp.c b/libavformat/sdp.c
+index 0f7eb2f..57044d4 100644
+--- a/libavformat/sdp.c
++++ b/libavformat/sdp.c
+@@ -590,12 +590,15 @@ static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c,
+     return buff;
+ }
+ 
+-void ff_sdp_write_media(char *buff, int size, AVCodecContext *c, const char *dest_addr, const char *dest_type, int port, int ttl, AVFormatContext *fmt)
++void ff_sdp_write_media(char *buff, int size, AVStream *st, int idx,
++                        const char *dest_addr, const char *dest_type,
++                        int port, int ttl, AVFormatContext *fmt)
+ {
++    AVCodecContext *c = st->codec;
+     const char *type;
+     int payload_type;
+ 
+-    payload_type = ff_rtp_get_payload_type(fmt, c);
++    payload_type = ff_rtp_get_payload_type(fmt, c, idx);
+ 
+     switch (c->codec_type) {
+         case AVMEDIA_TYPE_VIDEO   : type = "video"      ; break;
+@@ -617,7 +620,7 @@ int av_sdp_create(AVFormatContext *ac[], int n_files, char *buf, int size)
+ {
+     AVDictionaryEntry *title = av_dict_get(ac[0]->metadata, "title", NULL, 0);
+     struct sdp_session_level s = { 0 };
+-    int i, j, port, ttl, is_multicast;
++    int i, j, port, ttl, is_multicast, index = 0;
+     char dst[32], dst_type[5];
+ 
+     memset(buf, 0, size);
+@@ -656,10 +659,10 @@ int av_sdp_create(AVFormatContext *ac[], int n_files, char *buf, int size)
+                 ttl = 0;
+         }
+         for (j = 0; j < ac[i]->nb_streams; j++) {
+-            ff_sdp_write_media(buf, size,
+-                                  ac[i]->streams[j]->codec, dst[0] ? dst : NULL,
+-                                  dst_type, (port > 0) ? port + j * 2 : 0, ttl,
+-                                  ac[i]);
++            ff_sdp_write_media(buf, size, ac[i]->streams[j], index++,
++                               dst[0] ? dst : NULL, dst_type,
++                               (port > 0) ? port + j * 2 : 0,
++                               ttl, ac[i]);
+             if (port <= 0) {
+                 av_strlcatf(buf, size,
+                                    "a=control:streamid=%d\r\n", i + j);
+@@ -675,7 +678,9 @@ int av_sdp_create(AVFormatContext *ac[], int n_files, char *buf, int size)
+     return AVERROR(ENOSYS);
+ }
+ 
+-void ff_sdp_write_media(char *buff, int size, AVCodecContext *c, const char *dest_addr, const char *dest_type, int port, int ttl, AVFormatContext *fmt)
++void ff_sdp_write_media(char *buff, int size, AVStream *st, int idx,
++                        const char *dest_addr, const char *dest_type,
++                        int port, int ttl, AVFormatContext *fmt)
+ {
+ }
+ #endif
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0269-bgmc-Fix-av_malloc-checks-in-ff_bgmc_init.patch b/debian/patches/post-9beta2/0269-bgmc-Fix-av_malloc-checks-in-ff_bgmc_init.patch
new file mode 100644
index 0000000..9ae3fab
--- /dev/null
+++ b/debian/patches/post-9beta2/0269-bgmc-Fix-av_malloc-checks-in-ff_bgmc_init.patch
@@ -0,0 +1,27 @@
+From b74dbdd5e99aed7f3bf1ecb5da1b374e5ba35768 Mon Sep 17 00:00:00 2001
+From: Xi Wang <xi.wang at gmail.com>
+Date: Wed, 14 Nov 2012 13:45:24 -0500
+Subject: [PATCH 269/278] bgmc: Fix av_malloc checks in ff_bgmc_init()
+
+Signed-off-by: Xi Wang <xi.wang at gmail.com>
+Signed-off-by: Diego Biurrun <diego at biurrun.de>
+---
+ libavcodec/bgmc.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavcodec/bgmc.c b/libavcodec/bgmc.c
+index 08b1337..ec8cf9b 100644
+--- a/libavcodec/bgmc.c
++++ b/libavcodec/bgmc.c
+@@ -461,7 +461,7 @@ int ff_bgmc_init(AVCodecContext *avctx, uint8_t **cf_lut, int **cf_lut_status)
+     *cf_lut        = av_malloc(sizeof(*cf_lut)        * LUT_BUFF * 16 * LUT_SIZE);
+     *cf_lut_status = av_malloc(sizeof(*cf_lut_status) * LUT_BUFF);
+ 
+-    if (!cf_lut || !cf_lut_status) {
++    if (!*cf_lut || !*cf_lut_status) {
+         ff_bgmc_end(cf_lut, cf_lut_status);
+         av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
+         return AVERROR(ENOMEM);
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0270-configure-Add-option-to-disable-all-command-line-pro.patch b/debian/patches/post-9beta2/0270-configure-Add-option-to-disable-all-command-line-pro.patch
new file mode 100644
index 0000000..bef0956
--- /dev/null
+++ b/debian/patches/post-9beta2/0270-configure-Add-option-to-disable-all-command-line-pro.patch
@@ -0,0 +1,45 @@
+From e28b7553aeab8aa0d590683a21a9a6ab113cb433 Mon Sep 17 00:00:00 2001
+From: Diego Biurrun <diego at biurrun.de>
+Date: Sat, 10 Nov 2012 18:10:59 +0100
+Subject: [PATCH 270/278] configure: Add option to disable all command line
+ programs
+
+---
+ configure |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 779b733..261b0ac 100755
+--- a/configure
++++ b/configure
+@@ -101,12 +101,15 @@ Configuration options:
+   --enable-gray            enable full grayscale support (slower color)
+   --disable-swscale-alpha  disable alpha channel support in swscale
+ 
+-Component options:
+-  --disable-doc            do not build documentation
++Program options:
++  --disable-programs       do not build command line programs
+   --disable-avconv         disable avconv build
+   --disable-avplay         disable avplay build
+   --disable-avprobe        disable avprobe build
+   --disable-avserver       disable avserver build
++
++Component options:
++  --disable-doc            do not build documentation
+   --disable-avdevice       disable libavdevice build
+   --disable-avcodec        disable libavcodec build
+   --disable-avformat       disable libavformat build
+@@ -1945,6 +1948,9 @@ for opt do
+     ;;
+     --enable-debug=*) debuglevel="$optval"
+     ;;
++    --disable-programs)
++    disable $PROGRAM_LIST
++    ;;
+     --disable-everything)
+     map 'eval unset \${$(toupper ${v%s})_LIST}' $COMPONENT_LIST
+     ;;
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0271-doxygen-remove-obsolete-options-from-Doxyfile.patch b/debian/patches/post-9beta2/0271-doxygen-remove-obsolete-options-from-Doxyfile.patch
new file mode 100644
index 0000000..57ea126
--- /dev/null
+++ b/debian/patches/post-9beta2/0271-doxygen-remove-obsolete-options-from-Doxyfile.patch
@@ -0,0 +1,58 @@
+From 116ae7285e2b5a9487b12c904b006c3c0063e83c Mon Sep 17 00:00:00 2001
+From: Janne Grunau <janne-libav at jannau.net>
+Date: Sun, 28 Oct 2012 00:43:12 +0200
+Subject: [PATCH 271/278] doxygen: remove obsolete options from Doxyfile
+
+The options USE_INLINE_TREES, SHOW_DIRECTORIES and HTML_ALIGN_MEMBERS
+became obsolete with doxygen 1.8.1 (releaded 2012-05-19). The generated
+outpu for older doxygen versions should not change since they were set
+to the default value.
+---
+ doc/Doxyfile |   17 -----------------
+ 1 file changed, 17 deletions(-)
+
+diff --git a/doc/Doxyfile b/doc/Doxyfile
+index aa1f4e2..1a37021 100644
+--- a/doc/Doxyfile
++++ b/doc/Doxyfile
+@@ -489,12 +489,6 @@ MAX_INITIALIZER_LINES  = 30
+ 
+ SHOW_USED_FILES        = YES
+ 
+-# If the sources in your project are distributed over multiple directories
+-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+-# in the documentation. The default is NO.
+-
+-SHOW_DIRECTORIES       = NO
+-
+ # Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+ # This will remove the Files entry from the Quick Index and from the
+ # Folder Tree View (if specified). The default is YES.
+@@ -848,12 +842,6 @@ HTML_COLORSTYLE_GAMMA  = 80
+ 
+ HTML_TIMESTAMP         = YES
+ 
+-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+-# files or namespaces will be aligned in HTML using tables. If set to
+-# NO a bullet list will be used.
+-
+-HTML_ALIGN_MEMBERS     = YES
+-
+ # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+ # documentation will contain sections that can be hidden and shown after the
+ # page has loaded. For this to work a browser that supports
+@@ -1034,11 +1022,6 @@ ENUM_VALUES_PER_LINE   = 4
+ 
+ GENERATE_TREEVIEW      = NO
+ 
+-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
+-# and Class Hierarchy pages using a tree view instead of an ordered list.
+-
+-USE_INLINE_TREES       = NO
+-
+ # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+ # used to set the initial width (in pixels) of the frame in which the tree
+ # is shown.
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0272-configure-Check-for-Werror-parameters-on-clang.patch b/debian/patches/post-9beta2/0272-configure-Check-for-Werror-parameters-on-clang.patch
new file mode 100644
index 0000000..a9c946e
--- /dev/null
+++ b/debian/patches/post-9beta2/0272-configure-Check-for-Werror-parameters-on-clang.patch
@@ -0,0 +1,29 @@
+From 9eded0fe412e610ee8944681d5c554b723463e96 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
+Date: Tue, 13 Nov 2012 19:01:51 +0200
+Subject: [PATCH 272/278] configure: Check for -Werror parameters on clang
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Martin Storsjö <martin at martin.st>
+---
+ configure |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure b/configure
+index 261b0ac..14a887e 100755
+--- a/configure
++++ b/configure
+@@ -3549,6 +3549,8 @@ elif enabled llvm_gcc; then
+ elif enabled clang; then
+     check_cflags -mllvm -stack-alignment=16
+     check_cflags -Qunused-arguments
++    check_cflags -Werror=implicit-function-declaration
++    check_cflags -Werror=missing-prototypes
+ elif enabled armcc; then
+     # 2523: use of inline assembler is deprecated
+     add_cflags -W${armcc_opt},--diag_suppress=2523
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0273-avserver-remove-daemon-mode.patch b/debian/patches/post-9beta2/0273-avserver-remove-daemon-mode.patch
new file mode 100644
index 0000000..5eb3c1e
--- /dev/null
+++ b/debian/patches/post-9beta2/0273-avserver-remove-daemon-mode.patch
@@ -0,0 +1,167 @@
+From ada51a334aeb1e378fe852c8b5eede9cbbd05f69 Mon Sep 17 00:00:00 2001
+From: Mans Rullgard <mans at mansr.com>
+Date: Wed, 25 Apr 2012 12:08:54 +0000
+Subject: [PATCH 273/278] avserver: remove daemon mode
+
+This code spews a multitude of warnings with glibc (unchecked
+return values), some of them possibly warranted.  Furthermore,
+the deamonisation is not suitable for use with typical startup
+scripts as it does not provide the PID of the daemon in any way.
+Users wishing to run avserver as a daemon can still do so using
+start-stop-daemon or equivalent tools.
+
+Signed-off-by: Mans Rullgard <mans at mansr.com>
+Signed-off-by: Janne Grunau <janne-libav at jannau.net>
+---
+ Changelog         |    1 +
+ avserver.c        |   38 --------------------------------------
+ doc/avserver.conf |    3 ---
+ doc/avserver.texi |    8 +-------
+ 4 files changed, 2 insertions(+), 48 deletions(-)
+
+diff --git a/Changelog b/Changelog
+index f8079d1..33e55a5 100644
+--- a/Changelog
++++ b/Changelog
+@@ -9,6 +9,7 @@ version <next>:
+ version 9_beta2:
+ - metadata (INFO tag) support in WAV muxer
+ - support for building DLLs using MSVC
++- remove avserver daemon mode
+ 
+ 
+ version 9_beta1:
+diff --git a/avserver.c b/avserver.c
+index f9d85d8..649cbed 100644
+--- a/avserver.c
++++ b/avserver.c
+@@ -301,12 +301,10 @@ static int rtp_new_av_stream(HTTPContext *c,
+                              HTTPContext *rtsp_c);
+ 
+ static const char *my_program_name;
+-static const char *my_program_dir;
+ 
+ static const char *config_filename = "/etc/avserver.conf";
+ 
+ static int avserver_debug;
+-static int avserver_daemon;
+ static int no_launch;
+ static int need_to_start_children;
+ 
+@@ -524,9 +522,6 @@ static void start_children(FFStream *feed)
+                     }
+                 }
+ 
+-                /* This is needed to make relative pathnames work */
+-                chdir(my_program_dir);
+-
+                 signal(SIGPIPE, SIG_DFL);
+ 
+                 execvp(pathname, feed->child_argv);
+@@ -4081,8 +4076,6 @@ static int parse_ffconfig(const char *filename)
+             if (resolve_host(&my_http_addr.sin_addr, arg) != 0) {
+                 ERROR("%s:%d: Invalid host/IP address: %s\n", arg);
+             }
+-        } else if (!av_strcasecmp(cmd, "NoDaemon")) {
+-            avserver_daemon = 0;
+         } else if (!av_strcasecmp(cmd, "RTSPPort")) {
+             get_arg(arg, sizeof(arg), &p);
+             val = atoi(arg);
+@@ -4655,7 +4648,6 @@ static void handle_child_exit(int sig)
+ static void opt_debug(void)
+ {
+     avserver_debug = 1;
+-    avserver_daemon = 0;
+     logfilename[0] = '-';
+ }
+ 
+@@ -4686,8 +4678,6 @@ int main(int argc, char **argv)
+     show_banner();
+ 
+     my_program_name = argv[0];
+-    my_program_dir = getcwd(0, 0);
+-    avserver_daemon = 1;
+ 
+     parse_options(NULL, argc, argv, options, NULL);
+ 
+@@ -4719,37 +4709,9 @@ int main(int argc, char **argv)
+ 
+     compute_bandwidth();
+ 
+-    /* put the process in background and detach it from its TTY */
+-    if (avserver_daemon) {
+-        int pid;
+-
+-        pid = fork();
+-        if (pid < 0) {
+-            perror("fork");
+-            exit(1);
+-        } else if (pid > 0) {
+-            /* parent : exit */
+-            exit(0);
+-        } else {
+-            /* child */
+-            setsid();
+-            close(0);
+-            open("/dev/null", O_RDWR);
+-            if (strcmp(logfilename, "-") != 0) {
+-                close(1);
+-                dup(0);
+-            }
+-            close(2);
+-            dup(0);
+-        }
+-    }
+-
+     /* signal init */
+     signal(SIGPIPE, SIG_IGN);
+ 
+-    if (avserver_daemon)
+-        chdir("/");
+-
+     if (http_server() < 0) {
+         http_log("Could not start server\n");
+         exit(1);
+diff --git a/doc/avserver.conf b/doc/avserver.conf
+index e9724bb..e1cd9fb 100644
+--- a/doc/avserver.conf
++++ b/doc/avserver.conf
+@@ -25,9 +25,6 @@ MaxBandwidth 1000
+ # '-' is the standard output.
+ CustomLog -
+ 
+-# Suppress that if you want to launch avserver as a daemon.
+-NoDaemon
+-
+ 
+ ##################################################################
+ # Definition of the live feeds. Each live feed contains one video
+diff --git a/doc/avserver.texi b/doc/avserver.texi
+index c023814..88e6221 100644
+--- a/doc/avserver.texi
++++ b/doc/avserver.texi
+@@ -31,11 +31,6 @@ several live feeds, streaming from files and time shifting on live feeds
+ (you can seek to positions in the past on each live feed, provided you
+ specify a big enough feed storage in avserver.conf).
+ 
+-avserver runs in daemon mode by default; that is, it puts itself in
+-the background and detaches from its TTY, unless it is launched in
+-debug mode or a NoDaemon option is specified in the configuration
+-file.
+-
+ This documentation covers only the streaming aspects of avserver /
+ avconv. All questions about parameters for avconv, codec questions,
+ etc. are not covered here. Read @file{avconv.html} for more
+@@ -257,8 +252,7 @@ within the various <Stream> sections. Since avserver will not launch
+ any avconv instances, you will have to launch them manually.
+ @item -d
+ Enable debug mode. This option increases log verbosity, directs log
+-messages to stdout and causes avserver to run in the foreground
+-rather than as a daemon.
++messages to stdout.
+ @end table
+ @c man end
+ 
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0274-avserver-use-freopen-to-redirect-stdin-out-err-to-de.patch b/debian/patches/post-9beta2/0274-avserver-use-freopen-to-redirect-stdin-out-err-to-de.patch
new file mode 100644
index 0000000..9b439a3
--- /dev/null
+++ b/debian/patches/post-9beta2/0274-avserver-use-freopen-to-redirect-stdin-out-err-to-de.patch
@@ -0,0 +1,45 @@
+From a4cd2ad89aa67533ff69de49612c747825c3f96f Mon Sep 17 00:00:00 2001
+From: Janne Grunau <janne-libav at jannau.net>
+Date: Thu, 25 Oct 2012 14:54:48 +0200
+Subject: [PATCH 274/278] avserver: use freopen to redirect stdin/out/err to
+ /dev/null
+
+---
+ avserver.c |   14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/avserver.c b/avserver.c
+index 649cbed..9f6b9d9 100644
+--- a/avserver.c
++++ b/avserver.c
+@@ -25,6 +25,7 @@
+ #endif
+ #include <string.h>
+ #include <stdlib.h>
++#include <stdio.h>
+ #include "libavformat/avformat.h"
+ // FIXME those are internal headers, avserver _really_ shouldn't use them
+ #include "libavformat/ffm.h"
+@@ -513,13 +514,12 @@ static void start_children(FFStream *feed)
+                     close(i);
+ 
+                 if (!avserver_debug) {
+-                    i = open("/dev/null", O_RDWR);
+-                    if (i != -1) {
+-                        dup2(i, 0);
+-                        dup2(i, 1);
+-                        dup2(i, 2);
+-                        close(i);
+-                    }
++                    if (!freopen("/dev/null", "r", stdin))
++                        http_log("failed to redirect STDIN to /dev/null\n;");
++                    if (!freopen("/dev/null", "w", stdout))
++                        http_log("failed to redirect STDOUT to /dev/null\n;");
++                    if (!freopen("/dev/null", "w", stderr))
++                        http_log("failed to redirect STDERR to /dev/null\n;");
+                 }
+ 
+                 signal(SIGPIPE, SIG_DFL);
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0275-mxfdec-fix-typo-in-mxf_read_seek.patch b/debian/patches/post-9beta2/0275-mxfdec-fix-typo-in-mxf_read_seek.patch
new file mode 100644
index 0000000..b2cc6b5
--- /dev/null
+++ b/debian/patches/post-9beta2/0275-mxfdec-fix-typo-in-mxf_read_seek.patch
@@ -0,0 +1,32 @@
+From c84cce5a99b85737154bf7559a4bf38593b54a75 Mon Sep 17 00:00:00 2001
+From: Janne Grunau <janne-libav at jannau.net>
+Date: Fri, 26 Oct 2012 20:01:43 +0200
+Subject: [PATCH 275/278] mxfdec: fix typo in mxf_read_seek()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Check the number of index tables before using byte offset based seeking
+instead of the index_tables pointer.
+
+Found by Måns Rullgård <mans at mansr.com>.
+---
+ libavformat/mxfdec.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
+index 8595d72..61b9c68 100644
+--- a/libavformat/mxfdec.c
++++ b/libavformat/mxfdec.c
+@@ -2210,7 +2210,7 @@ static int mxf_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti
+     int ret;
+     MXFIndexTable *t;
+ 
+-    if (mxf->index_tables <= 0) {
++    if (mxf->nb_index_tables <= 0) {
+     if (!s->bit_rate)
+         return AVERROR_INVALIDDATA;
+     if (sample_time < 0)
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0276-APIChanges-add-entry-for-av_read_packet-deprecation.patch b/debian/patches/post-9beta2/0276-APIChanges-add-entry-for-av_read_packet-deprecation.patch
new file mode 100644
index 0000000..cb98a06
--- /dev/null
+++ b/debian/patches/post-9beta2/0276-APIChanges-add-entry-for-av_read_packet-deprecation.patch
@@ -0,0 +1,27 @@
+From bf5f46b4cc47b7a4568119f224057d4ff91b6cdd Mon Sep 17 00:00:00 2001
+From: Janne Grunau <janne-libav at jannau.net>
+Date: Thu, 25 Oct 2012 16:26:06 +0200
+Subject: [PATCH 276/278] APIChanges: add entry for av_read_packet deprecation
+
+---
+ doc/APIchanges |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/doc/APIchanges b/doc/APIchanges
+index a0756da..1c6247e 100644
+--- a/doc/APIchanges
++++ b/doc/APIchanges
+@@ -182,6 +182,10 @@ API changes, most recent first:
+ 2012-04-05 - 5cc51a5 - lavu 51.26.0 - audioconvert.h
+   Add av_get_default_channel_layout()
+ 
++2012-03-20 - 3c90cc2 - lavfo 54.2.0
++  Deprecate av_read_packet(), use av_read_frame() with
++  AVFMT_FLAG_NOPARSE | AVFMT_FLAG_NOFILLIN in AVFormatContext.flags
++
+ 2012-03-06 - 4d851f8 - lavu 51.25.0 - cpu.h
+   Add av_set_cpu_flags_mask().
+ 
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0277-avserver-fix-constness-casting-warnings.patch b/debian/patches/post-9beta2/0277-avserver-fix-constness-casting-warnings.patch
new file mode 100644
index 0000000..401c3be
--- /dev/null
+++ b/debian/patches/post-9beta2/0277-avserver-fix-constness-casting-warnings.patch
@@ -0,0 +1,89 @@
+From 39c4afd926944a716c3b11b321cea7f7c798e9e7 Mon Sep 17 00:00:00 2001
+From: Janne Grunau <janne-libav at jannau.net>
+Date: Thu, 25 Oct 2012 15:55:05 +0200
+Subject: [PATCH 277/278] avserver: fix constness casting warnings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use a different char* for extracting info string from the URL. The
+other pointer can be made const then which elimates the need for a
+cast and fixes the following warnings:
+warning: to be safe all intermediate pointers in cast from ‘char **’ to
+‘const char **’ must be ‘const’ qualified [-Wcast-qual]
+---
+ avserver.c |   21 +++++++++++----------
+ 1 file changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/avserver.c b/avserver.c
+index 9f6b9d9..7b38c23 100644
+--- a/avserver.c
++++ b/avserver.c
+@@ -1478,7 +1478,8 @@ enum RedirType {
+ /* parse http request and prepare header */
+ static int http_parse_request(HTTPContext *c)
+ {
+-    char *p;
++    const char *p;
++    char *p1;
+     enum RedirType redir_type;
+     char cmd[32];
+     char info[1024], filename[1024];
+@@ -1489,10 +1490,10 @@ static int http_parse_request(HTTPContext *c)
+     FFStream *stream;
+     int i;
+     char ratebuf[32];
+-    char *useragent = 0;
++    const char *useragent = 0;
+ 
+     p = c->buffer;
+-    get_word(cmd, sizeof(cmd), (const char **)&p);
++    get_word(cmd, sizeof(cmd), &p);
+     av_strlcpy(c->method, cmd, sizeof(c->method));
+ 
+     if (!strcmp(cmd, "GET"))
+@@ -1502,7 +1503,7 @@ static int http_parse_request(HTTPContext *c)
+     else
+         return -1;
+ 
+-    get_word(url, sizeof(url), (const char **)&p);
++    get_word(url, sizeof(url), &p);
+     av_strlcpy(c->url, url, sizeof(c->url));
+ 
+     get_word(protocol, sizeof(protocol), (const char **)&p);
+@@ -1515,10 +1516,10 @@ static int http_parse_request(HTTPContext *c)
+         http_log("%s - - New connection: %s %s\n", inet_ntoa(c->from_addr.sin_addr), cmd, url);
+ 
+     /* find the filename and the optional info string in the request */
+-    p = strchr(url, '?');
+-    if (p) {
+-        av_strlcpy(info, p, sizeof(info));
+-        *p = '\0';
++    p1 = strchr(url, '?');
++    if (p1) {
++        av_strlcpy(info, p1, sizeof(info));
++        *p1 = '\0';
+     } else
+         info[0] = '\0';
+ 
+@@ -1635,7 +1636,7 @@ static int http_parse_request(HTTPContext *c)
+     }
+ 
+     if (redir_type != REDIR_NONE) {
+-        char *hostinfo = 0;
++        const char *hostinfo = 0;
+ 
+         for (p = c->buffer; *p && *p != '\r' && *p != '\n'; ) {
+             if (av_strncasecmp(p, "Host:", 5) == 0) {
+@@ -1764,7 +1765,7 @@ static int http_parse_request(HTTPContext *c)
+         if (!stream->is_feed) {
+             /* However it might be a status report from WMP! Let us log the
+              * data as it might come in handy one day. */
+-            char *logline = 0;
++            const char *logline = 0;
+             int client_id = 0;
+ 
+             for (p = c->buffer; *p && *p != '\r' && *p != '\n'; ) {
+-- 
+1.7.9.5
+
diff --git a/debian/patches/post-9beta2/0278-avserver-replace-av_read_packet-with-av_read_frame.patch b/debian/patches/post-9beta2/0278-avserver-replace-av_read_packet-with-av_read_frame.patch
new file mode 100644
index 0000000..b8884cf
--- /dev/null
+++ b/debian/patches/post-9beta2/0278-avserver-replace-av_read_packet-with-av_read_frame.patch
@@ -0,0 +1,34 @@
+From 566de8cde29d999fd05c477158adbd580b8522c7 Mon Sep 17 00:00:00 2001
+From: Janne Grunau <janne-libav at jannau.net>
+Date: Thu, 25 Oct 2012 16:19:16 +0200
+Subject: [PATCH 278/278] avserver: replace av_read_packet with av_read_frame
+
+---
+ avserver.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/avserver.c b/avserver.c
+index 7b38c23..ad7bc78 100644
+--- a/avserver.c
++++ b/avserver.c
+@@ -3562,6 +3562,8 @@ static void extract_mpeg4_header(AVFormatContext *infile)
+     AVStream *st;
+     const uint8_t *p;
+ 
++    infile->flags |= AVFMT_FLAG_NOFILLIN | AVFMT_FLAG_NOPARSE;
++
+     mpeg4_count = 0;
+     for(i=0;i<infile->nb_streams;i++) {
+         st = infile->streams[i];
+@@ -3575,7 +3577,7 @@ static void extract_mpeg4_header(AVFormatContext *infile)
+ 
+     printf("MPEG4 without extra data: trying to find header in %s\n", infile->filename);
+     while (mpeg4_count > 0) {
+-        if (av_read_packet(infile, &pkt) < 0)
++        if (av_read_frame(infile, &pkt) < 0)
+             break;
+         st = infile->streams[pkt.stream_index];
+         if (st->codec->codec_id == AV_CODEC_ID_MPEG4 &&
+-- 
+1.7.9.5
+
diff --git a/debian/patches/series b/debian/patches/series
index 7b4cff0..5af429f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -205,3 +205,77 @@ post-9beta2/0201-configure-add-lavu-dependency-to-lavr-lavfi-.pc-file.patch
 post-9beta2/0202-mss2-fix-handling-of-unmasked-implicit-WMV9-rectangl.patch
 post-9beta2/0203-mss2-reindent-after-last-commit.patch
 post-9beta2/0204-mss2-prevent-potential-uninitialized-reads.patch
+post-9beta2/0205-lavu-rename-audioconvert.-to-channel_layout.-and-dep.patch
+post-9beta2/0206-Include-libavutil-channel_layout.h-instead-of-libavu.patch
+post-9beta2/0207-doc-git-howto-Leave-reviewers-time-to-react-before-p.patch
+post-9beta2/0208-x86-Require-an-assembler-able-to-cope-with-AVX-instr.patch
+post-9beta2/0209-build-Drop-AVX-assembly-ifdefs.patch
+post-9beta2/0210-binkaudio-set-channel-layout.patch
+post-9beta2/0211-configure-remove-support-for-n-flag-in-print_enabled.patch
+post-9beta2/0212-ppc-fix-some-unused-variable-warnings.patch
+post-9beta2/0213-ppc-replace-pointer-casting-with-AV_COPY32.patch
+post-9beta2/0214-amr-set-channel_layout.patch
+post-9beta2/0215-apc-set-channel-layout.patch
+post-9beta2/0216-bethsoftvid-set-channel-layout.patch
+post-9beta2/0217-bfi-set-channel-layout.patch
+post-9beta2/0218-bink-set-channel-layout.patch
+post-9beta2/0219-bmv-set-channel-layout.patch
+post-9beta2/0220-cdxl-set-channel-layout.patch
+post-9beta2/0221-daud-set-channel-layout.patch
+post-9beta2/0222-dsicin-set-channel-layout.patch
+post-9beta2/0223-dv-set-channel-layout.patch
+post-9beta2/0224-flvdec-set-channel-layout.patch
+post-9beta2/0225-gsmdec-set-channel-layout.patch
+post-9beta2/0226-gxfdec-set-channel-layout-when-applicable.patch
+post-9beta2/0227-idroqdec-set-channel-layout.patch
+post-9beta2/0228-iff-set-channel-layout.patch
+post-9beta2/0229-ipmovie-set-channel-layout.patch
+post-9beta2/0230-iss-set-channel-layout.patch
+post-9beta2/0231-jvdec-set-channel-layout.patch
+post-9beta2/0232-mm-set-channel-layout.patch
+post-9beta2/0233-mmf-set-channel-layout.patch
+post-9beta2/0234-mpc7-set-channel-layout.patch
+post-9beta2/0235-mvi-set-channel-layout.patch
+post-9beta2/0236-mxg-set-channel-layout.patch
+post-9beta2/0237-nuv-set-channel-layout.patch
+post-9beta2/0238-oggparsespeex-validate-channel-count-and-set-channel.patch
+post-9beta2/0239-omadec-set-channel-layout.patch
+post-9beta2/0240-psxstr-set-channel-layout.patch
+post-9beta2/0241-qcp-set-channel-layout.patch
+post-9beta2/0242-rmdec-set-channel-layout-for-RA-version-3.patch
+post-9beta2/0243-rsodec-set-channel-layout.patch
+post-9beta2/0244-rtpdec_amr-set-channel-layout.patch
+post-9beta2/0245-sierravmd-set-channel-layout.patch
+post-9beta2/0246-siff-set-channel-layout.patch
+post-9beta2/0247-smacker-set-channel-layout.patch
+post-9beta2/0248-sol-set-channel-layout.patch
+post-9beta2/0249-swfdec-set-channel-layout.patch
+post-9beta2/0250-tiertexseq-set-channel-layout.patch
+post-9beta2/0251-tmv-set-channel-layout.patch
+post-9beta2/0252-wc3movie-set-channel-layout.patch
+post-9beta2/0253-westwood_aud-set-channel-layout.patch
+post-9beta2/0254-wtv-set-channel-layout-for-mpeg-audio.patch
+post-9beta2/0255-yop-set-channel-layout.patch
+post-9beta2/0256-hlsenc-stand-alone-hls-segmenter.patch
+post-9beta2/0257-pixdesc-add-av_pix_fmt_get_chroma_sub_sample.patch
+post-9beta2/0258-avcodec-remove-ff_is_hwaccel_pix_fmt.patch
+post-9beta2/0259-libtheoraenc-add-missing-pixdesc.h-header.patch
+post-9beta2/0260-x86-h264_weight_10bit-port-to-cpuflags.patch
+post-9beta2/0261-Drop-broken-and-unused-CABAC-test-program.patch
+post-9beta2/0262-x86-mmx2-mmxext-in-asm-constructs.patch
+post-9beta2/0263-segment-fix-NULL-pointer-dereference-in-seg_write_he.patch
+post-9beta2/0264-avutil-change-GET_UTF8-to-not-use-av_log2.patch
+post-9beta2/0265-ppc-do-not-pass-redundant-compiler-flags.patch
+post-9beta2/0266-fate-Add-dependencies-for-aac-alac-amrnb-amrwb-atrac.patch
+post-9beta2/0267-avformat-clarify-stream-id-for-muxing.patch
+post-9beta2/0268-rtp-set-the-payload-type-as-stream-id.patch
+post-9beta2/0269-bgmc-Fix-av_malloc-checks-in-ff_bgmc_init.patch
+post-9beta2/0270-configure-Add-option-to-disable-all-command-line-pro.patch
+post-9beta2/0271-doxygen-remove-obsolete-options-from-Doxyfile.patch
+post-9beta2/0272-configure-Check-for-Werror-parameters-on-clang.patch
+post-9beta2/0273-avserver-remove-daemon-mode.patch
+post-9beta2/0274-avserver-use-freopen-to-redirect-stdin-out-err-to-de.patch
+post-9beta2/0275-mxfdec-fix-typo-in-mxf_read_seek.patch
+post-9beta2/0276-APIChanges-add-entry-for-av_read_packet-deprecation.patch
+post-9beta2/0277-avserver-fix-constness-casting-warnings.patch
+post-9beta2/0278-avserver-replace-av_read_packet-with-av_read_frame.patch

-- 
Libav/FFmpeg packaging

