diff options
| author | Chris Rankin <rankincj@yahoo.com> | 2011-08-29 09:33:16 +0100 |
|---|---|---|
| committer | Chris Rankin <rankincj@yahoo.com> | 2011-08-29 09:33:16 +0100 |
| commit | 80cbcb6136ca8a4b93c8dd652e8349c7f9ac9dd4 (patch) | |
| tree | 0d4bf3e1b2a812fdcfd2fd408a8d1b7392536ef6 /src/demuxers/demux_ts.c | |
| parent | d211575f64577027568ff85497eb357f878401fb (diff) | |
| download | xine-lib-80cbcb6136ca8a4b93c8dd652e8349c7f9ac9dd4.tar.gz xine-lib-80cbcb6136ca8a4b93c8dd652e8349c7f9ac9dd4.tar.bz2 | |
Add AAC LATM support from FFmpeg 0.7+
I've now tested this patch on Fedora 15 (FFmpeg 0.7) and Fedora 14 (FFmpeg
0.6), and am happy to report that it works fine on F15 and doesn't break
xine-lib on F14. On F14, it also has the happy side effect of no longer
trying to decode an LATM AAC stream with the xineplug_decode_faad.so plugin.
(Which was something which never ended well anyway.)
Diffstat (limited to 'src/demuxers/demux_ts.c')
| -rw-r--r-- | src/demuxers/demux_ts.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index cde28adfb..1f0640147 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -921,10 +921,13 @@ static int demux_ts_parse_pes_header (xine_t *xine, demux_ts_media *m, m->type |= BUF_AUDIO_MPEG; break; case ISO_13818_PART7_AUDIO: - case ISO_14496_PART3_AUDIO: lprintf ("demux_ts: found AAC audio track.\n"); m->type |= BUF_AUDIO_AAC; break; + case ISO_14496_PART3_AUDIO: + lprintf ("demux_ts: found AAC LATM audio track.\n"); + m->type |= BUF_AUDIO_AAC_LATM; + break; default: lprintf ("demux_ts: unknown audio type: %d, defaulting to MPEG.\n", m->descriptor_tag); m->type |= BUF_AUDIO_MPEG; |