diff options
| author | asivery <asivery@protonmail.com> | 2024-09-24 18:58:37 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2024-10-13 13:43:39 +0200 |
| commit | 31a63e4e011a63e3ae6dd2a02864055e29bd467a (patch) | |
| tree | 74336f61dfb5fd7e7be9ea6037695058401e0361 /libavformat | |
| parent | 37863b92b74ad07d994257a536bec22b66c2e462 (diff) | |
| download | ffmpeg-31a63e4e011a63e3ae6dd2a02864055e29bd467a.tar.gz | |
avformat/oma: Demux oma-encapsulated AAC audio
Signed-off-by: asivery <asivery@protonmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/oma.c | 1 | ||||
| -rw-r--r-- | libavformat/oma.h | 1 | ||||
| -rw-r--r-- | libavformat/omadec.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/oma.c b/libavformat/oma.c index 7282d464aa..68482fca74 100644 --- a/libavformat/oma.c +++ b/libavformat/oma.c @@ -28,6 +28,7 @@ const uint16_t ff_oma_srate_tab[8] = { 320, 441, 480, 882, 960, 0 }; const AVCodecTag ff_oma_codec_tags[] = { { AV_CODEC_ID_ATRAC3, OMA_CODECID_ATRAC3 }, { AV_CODEC_ID_ATRAC3P, OMA_CODECID_ATRAC3P }, + { AV_CODEC_ID_AAC, OMA_CODECID_AAC }, { AV_CODEC_ID_MP3, OMA_CODECID_MP3 }, { AV_CODEC_ID_PCM_S16BE, OMA_CODECID_LPCM }, { AV_CODEC_ID_ATRAC3PAL, OMA_CODECID_ATRAC3PAL }, diff --git a/libavformat/oma.h b/libavformat/oma.h index 1a8e16f6d6..d9c7795d5b 100644 --- a/libavformat/oma.h +++ b/libavformat/oma.h @@ -34,6 +34,7 @@ enum { OMA_CODECID_ATRAC3 = 0, OMA_CODECID_ATRAC3P = 1, + OMA_CODECID_AAC = 2, OMA_CODECID_MP3 = 3, OMA_CODECID_LPCM = 4, OMA_CODECID_WMA = 5, diff --git a/libavformat/omadec.c b/libavformat/omadec.c index 86d3e7202f..552a37df18 100644 --- a/libavformat/omadec.c +++ b/libavformat/omadec.c @@ -511,6 +511,7 @@ static int oma_read_header(AVFormatContext *s) st->codecpar->bit_rate = samplerate * framesize / (2048 / 8); avpriv_set_pts_info(st, 64, 1, samplerate); break; + case OMA_CODECID_AAC: case OMA_CODECID_MP3: ffstream(st)->need_parsing = AVSTREAM_PARSE_FULL_RAW; framesize = 1024; |