[FFmpeg-cvslog] avformat/matroskaenc: Move AAC extradata check to other audio checks

[Andreas Rheinhardt]

ffmpeg | branch: release/5.0 | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Fri Jan  7 07:49:22 2022 +0100| [48e85918b87d0a02e341360bd0222ce65f2ee256] | committer: Andreas Rheinhardt

avformat/matroskaenc: Move AAC extradata check to other audio checks

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
(cherry picked from commit d266bf17988271d529fd2209681889a78b9f259c)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=48e85918b87d0a02e341360bd0222ce65f2ee256
---

 libavformat/matroskaenc.c | 13 ++++++-------
 1 file 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);