[SCM] libav/experimental: mpegtsenc: support CODEC_ID_AAC_LATM

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 4d54df8e07dca3e30ebcaffd1a0e750a876700a2
Author: Peter Ross <pross at xvid.org>
Date:   Fri Jan 28 22:28:03 2011 +0000

    mpegtsenc: support CODEC_ID_AAC_LATM
    
    $subject. Have used this for loopback testing with mpegts.c.
    
    -- Peter
    (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
    [2. text/x-diff; 0001-mpegtsenc-support-CODEC_ID_AAC_LATM.patch]
    
    From 0f7f9db4b7da1793996af6dda84298507703759a Mon Sep 17 00:00:00 2001
    From: Peter Ross <pross at xvid.org>
    Date: Sun, 9 Jan 2011 09:45:50 +1100
    Subject: [PATCH] mpegtsenc: support CODEC_ID_AAC_LATM
    
    Signed-off-by: Mans Rullgard <mans at mansr.com>

diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h
index 25f2107..e603297 100644
--- a/libavformat/mpegts.h
+++ b/libavformat/mpegts.h
@@ -48,6 +48,7 @@
 #define STREAM_TYPE_PRIVATE_SECTION 0x05
 #define STREAM_TYPE_PRIVATE_DATA    0x06
 #define STREAM_TYPE_AUDIO_AAC       0x0f
+#define STREAM_TYPE_AUDIO_AAC_LATM  0x11
 #define STREAM_TYPE_VIDEO_MPEG4     0x10
 #define STREAM_TYPE_VIDEO_H264      0x1b
 #define STREAM_TYPE_VIDEO_VC1       0xea
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 6f35d6f..b58e84b 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -243,6 +243,9 @@ static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
         case CODEC_ID_AAC:
             stream_type = STREAM_TYPE_AUDIO_AAC;
             break;
+        case CODEC_ID_AAC_LATM:
+            stream_type = STREAM_TYPE_AUDIO_AAC_LATM;
+            break;
         case CODEC_ID_AC3:
             stream_type = STREAM_TYPE_AUDIO_AC3;
             break;

-- 
Libav/FFmpeg packaging