virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Report "unknown codec" instead of "unspecifed size" if the codec is unknown.

Browse Source
This commit is contained in:
Carl Eugen Hoyos
2014-06-01 19:40:56 +02:00
parent 22d1b24982
commit f284e85714
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/utils.c
View File

@@ -2644,6 +2644,9 @@ static int has_codec_parameters(AVStream *st, const char **errmsg_ptr)
return 0; \ return 0; \
} while (0) } while (0)
if ( avctx->codec_id == AV_CODEC_ID_NONE
&& avctx->codec_type != AVMEDIA_TYPE_DATA)
FAIL("unknown codec");
switch (avctx->codec_type) { switch (avctx->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
if (!avctx->frame_size && determinable_frame_size(avctx)) if (!avctx->frame_size && determinable_frame_size(avctx))
@@ -2675,8 +2678,6 @@ static int has_codec_parameters(AVStream *st, const char **errmsg_ptr)
if (avctx->codec_id == AV_CODEC_ID_NONE) return 1; if (avctx->codec_id == AV_CODEC_ID_NONE) return 1;
} }
if (avctx->codec_id == AV_CODEC_ID_NONE)
FAIL("unknown codec");
return 1; return 1;
} }