diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-09 21:25:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-09 21:25:49 +0100 |
| commit | f95cd5a235bae89510cfe4320f2189c9cfbcc457 (patch) | |
| tree | f33d6e04e8abacf97b6c920aeb85d4f89ed5fe4d | |
| parent | 1cf0f27985965c28049b7a8481c859867dad3948 (diff) | |
| parent | 51da7d02748cc54b7d009115e76efa940b99a8ef (diff) | |
| download | ffmpeg-f95cd5a235bae89510cfe4320f2189c9cfbcc457.tar.gz | |
Merge commit '51da7d02748cc54b7d009115e76efa940b99a8ef'
* commit '51da7d02748cc54b7d009115e76efa940b99a8ef':
matroskaenc: refuse to write AAC without valid extradata
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/matroskaenc.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 33c9ed182a..dabfd86264 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -570,20 +570,21 @@ static int put_flac_codecpriv(AVFormatContext *s, return 0; } -static void get_aac_sample_rates(AVFormatContext *s, AVCodecContext *codec, - int *sample_rate, int *output_sample_rate) +static int get_aac_sample_rates(AVFormatContext *s, AVCodecContext *codec, + int *sample_rate, int *output_sample_rate) { MPEG4AudioConfig mp4ac; if (avpriv_mpeg4audio_get_config(&mp4ac, codec->extradata, codec->extradata_size * 8, 1) < 0) { - av_log(s, AV_LOG_WARNING, + av_log(s, AV_LOG_ERROR, "Error parsing AAC extradata, unable to determine samplerate.\n"); - return; + return AVERROR(EINVAL); } *sample_rate = mp4ac.sample_rate; *output_sample_rate = mp4ac.ext_sample_rate; + return 0; } static int mkv_write_native_codecprivate(AVFormatContext *s, @@ -822,8 +823,11 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, if (!bit_depth) bit_depth = codec->bits_per_coded_sample; - if (codec->codec_id == AV_CODEC_ID_AAC) - get_aac_sample_rates(s, codec, &sample_rate, &output_sample_rate); + if (codec->codec_id == AV_CODEC_ID_AAC) { + ret = get_aac_sample_rates(s, codec, &sample_rate, &output_sample_rate); + if (ret < 0) + return ret; + } track = start_ebml_master(pb, MATROSKA_ID_TRACKENTRY, 0); put_ebml_uint (pb, MATROSKA_ID_TRACKNUMBER, |