[FFmpeg-devel] [PATCH 1/2] avcodec/libfdk-aacenc: change MODE_7_1_REAR_SURROUND to map to AV_CH_LAYOUT_7POINT1

[Michael Niedermayer]

On Mon, Jan 27, 2014 at 09:58:08PM +0100, Jean First wrote:
> On Sun Jan 26 2014 14:49:32 GMT+0100 (CET), Michael Niedermayer wrote:
> >This was suggested by Rodeo on IRC
> ><Rodeo> sorry, I meant MODE_7_1_REAR_SURROUND would probably be AV_CH_LAYOUT_7POINT1
> >
> >Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> >---
> >  libavcodec/libfdk-aacenc.c |    4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> >diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c
> >index 82bfce1..4a1cc10 100644
> >--- a/libavcodec/libfdk-aacenc.c
> >+++ b/libavcodec/libfdk-aacenc.c
> >@@ -154,7 +154,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
> >      case 8:
> >          sce = 2;
> >          cpe = 3;
> >-        if (avctx->channel_layout == AV_CH_LAYOUT_7POINT1_WIDE_BACK) {
> >+        if (avctx->channel_layout == AV_CH_LAYOUT_7POINT1) {
> >              mode = MODE_7_1_REAR_SURROUND;
> >          } else {
> >              // MODE_1_2_2_2_1 and MODE_7_1_FRONT_CENTER use the same channel layout
> >@@ -395,7 +395,7 @@ static const uint64_t aac_channel_layout[] = {
> >      AV_CH_LAYOUT_5POINT0_BACK,
> >      AV_CH_LAYOUT_5POINT1_BACK,
> >      AV_CH_LAYOUT_7POINT1_WIDE,
> >-    AV_CH_LAYOUT_7POINT1_WIDE_BACK,
> >+    AV_CH_LAYOUT_7POINT1,
> >      0,
> >  };
> 
> this looks sane.

ok
applied
thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

If you think the mosad wants you dead since a long time then you are either
wrong or dead since a long time.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140127/168e9d9b/attachment.asc>