virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

lavf/concatdec: add stream_codec directive

Browse Source
This commit is contained in:
Nicolas George 2021-08-31 14:30:28 +02:00
parent 449ba49a9f
commit 0a267bc5e2
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/demuxers.texi
View File

@ -181,6 +181,9 @@ streams is not reliable.
Metadata for the stream. Metadata for the stream.
Can be present multiple times. Can be present multiple times.
@item @code{stream_codec @var{value}}
Codec for the stream.
@end table @end table
@subsection Options @subsection Options

13
libavformat/concatdec.c
View File

@ -431,6 +431,7 @@ typedef enum ParseDirective {
DIR_STREAM, DIR_STREAM,
DIR_EXSID, DIR_EXSID,
DIR_STMETA, DIR_STMETA,
DIR_STCODEC,
} ParseDirective; } ParseDirective;
static const ParseSyntax syntax[] = { static const ParseSyntax syntax[] = {
@ -445,6 +446,7 @@ static const ParseSyntax syntax[] = {
[DIR_STREAM ] = { "stream", "", 0 }, [DIR_STREAM ] = { "stream", "", 0 },
[DIR_EXSID ] = { "exact_stream_id", "i", NEEDS_STREAM }, [DIR_EXSID ] = { "exact_stream_id", "i", NEEDS_STREAM },
[DIR_STMETA ] = { "stream_meta", "ks", NEEDS_STREAM }, [DIR_STMETA ] = { "stream_meta", "ks", NEEDS_STREAM },
[DIR_STCODEC ] = { "stream_codec", "k", NEEDS_STREAM },
}; };
static int concat_parse_script(AVFormatContext *avf) static int concat_parse_script(AVFormatContext *avf)
@ -596,6 +598,17 @@ static int concat_parse_script(AVFormatContext *avf)
FAIL(ret); FAIL(ret);
break; break;
case DIR_STCODEC: {
const AVCodecDescriptor *codec = avcodec_descriptor_get_by_name(arg_kw[0]);
if (!codec) {
av_log(avf, AV_LOG_ERROR, "Line %d: codec '%s' not found\n", line, arg_kw[0]);
FAIL(AVERROR_DECODER_NOT_FOUND);
}
stream->codecpar->codec_type = codec->type;
stream->codecpar->codec_id = codec->id;
break;
}
default: default:
FAIL(AVERROR_BUG); FAIL(AVERROR_BUG);
} }