diff options
| author | Rodeo <[email protected]> | 2012-12-31 16:54:11 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2012-12-31 16:54:11 +0000 |
| commit | 01d1b85d7adecdc588d5450ee43c52809c0b1c3f (patch) | |
| tree | 4f08f2381a18b4e62c4e5a82d7b610c68e8f1432 /contrib/ffmpeg/A02-channel-layout-order.patch | |
| parent | b96ca4f7de03e2c1b2d6865a0ae65798c1afed6f (diff) | |
Bump libav to v9_beta3.
Miscellaneous bugfixes and improvements.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5124 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/ffmpeg/A02-channel-layout-order.patch')
| -rw-r--r-- | contrib/ffmpeg/A02-channel-layout-order.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/contrib/ffmpeg/A02-channel-layout-order.patch b/contrib/ffmpeg/A02-channel-layout-order.patch index 2326e7d3e..ce57af038 100644 --- a/contrib/ffmpeg/A02-channel-layout-order.patch +++ b/contrib/ffmpeg/A02-channel-layout-order.patch @@ -1,20 +1,20 @@ diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c -index 91efaf3..e6c5c8e 100644 +index 3852f6e..c7217c8 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c -@@ -30,6 +30,7 @@ - #include "dsputil.h" +@@ -28,6 +28,7 @@ + + #include "avcodec.h" #include "libavutil/intreadwrite.h" ++#include "libavutil/channel_layout.h" #include "get_bits.h" -+#include "libavutil/audioconvert.h" + #include "internal.h" #include "libavutil/crc.h" - #include "parser.h" - #include "mlp_parser.h" -@@ -434,6 +435,28 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, +@@ -435,6 +436,28 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, s->ch_assign[ch_assign] = ch; } -+ if (m->avctx->codec_id == CODEC_ID_TRUEHD) { ++ if (m->avctx->codec_id == AV_CODEC_ID_TRUEHD) { + switch (m->avctx->channel_layout) { + case AV_CH_LAYOUT_6POINT1: + case (AV_CH_LAYOUT_6POINT1|AV_CH_TOP_CENTER): |