diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-01-07 07:49:22 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-01-08 19:11:17 +0100 |
| commit | 48e85918b87d0a02e341360bd0222ce65f2ee256 (patch) | |
| tree | 20234a282a66916f6aa080cd90e62c57b5e71ccc | |
| parent | 60604702cd4b33c3f12bc5eaf8bc11802f5ebe36 (diff) | |
| download | ffmpeg-48e85918b87d0a02e341360bd0222ce65f2ee256.tar.gz | |
avformat/matroskaenc: Move AAC extradata check to other audio checks
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
(cherry picked from commit d266bf17988271d529fd2209681889a78b9f259c)
| -rw-r--r-- | libavformat/matroskaenc.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 6ba1dadee9..303aa1ce50 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1173,13 +1173,6 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, if (par->codec_type == AVMEDIA_TYPE_ATTACHMENT) return 0; - if (par->codec_id == AV_CODEC_ID_AAC) { - ret = get_aac_sample_rates(s, mkv, par->extradata, par->extradata_size, - &sample_rate, &output_sample_rate); - if (ret < 0) - return ret; - } - track_master = start_ebml_master(pb, MATROSKA_ID_TRACKENTRY, 0); put_ebml_uint(pb, MATROSKA_ID_TRACKNUMBER, track->track_num); put_ebml_uid (pb, MATROSKA_ID_TRACKUID, track->uid); @@ -1377,6 +1370,12 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, } if (par->codec_id == AV_CODEC_ID_OPUS) put_ebml_uint(pb, MATROSKA_ID_SEEKPREROLL, OPUS_SEEK_PREROLL); + else if (par->codec_id == AV_CODEC_ID_AAC) { + ret = get_aac_sample_rates(s, mkv, par->extradata, par->extradata_size, + &sample_rate, &output_sample_rate); + if (ret < 0) + return ret; + } put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_AUDIO); |