virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavf/matroskaenc: provide more feedback in case of unsupported codec

Browse Source 
Also return meaningful error code.
This commit is contained in:
Stefano Sabatini
2013-02-10 18:02:59 +01:00
parent f0703b6cba
commit 6b171f046c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/matroskaenc.c
View File

@@ -498,8 +498,9 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, AVCodecCo
if (!codec->codec_tag) if (!codec->codec_tag)
codec->codec_tag = ff_codec_get_tag(ff_codec_bmp_tags, codec->codec_id); codec->codec_tag = ff_codec_get_tag(ff_codec_bmp_tags, codec->codec_id);
if (!codec->codec_tag) { if (!codec->codec_tag) {
av_log(s, AV_LOG_ERROR, "No bmp codec ID found.\n"); av_log(s, AV_LOG_ERROR, "No bmp codec tag found for codec %s\n",
ret = -1; avcodec_get_name(codec->codec_id));
ret = AVERROR(EINVAL);
} }
ff_put_bmp_header(dyn_cp, codec, ff_codec_bmp_tags, 0); ff_put_bmp_header(dyn_cp, codec, ff_codec_bmp_tags, 0);
@@ -509,8 +510,9 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, AVCodecCo
unsigned int tag; unsigned int tag;
tag = ff_codec_get_tag(ff_codec_wav_tags, codec->codec_id); tag = ff_codec_get_tag(ff_codec_wav_tags, codec->codec_id);
if (!tag) { if (!tag) {
av_log(s, AV_LOG_ERROR, "No wav codec ID found.\n"); av_log(s, AV_LOG_ERROR, "No wav codec tag found for codec %s\n",
ret = -1; avcodec_get_name(codec->codec_id));
ret = AVERROR(EINVAL);
} }
if (!codec->codec_tag) if (!codec->codec_tag)
codec->codec_tag = tag; codec->codec_tag = tag;