diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-06-18 11:19:27 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-10-19 17:02:11 +0200 |
| commit | 569129a6dc503379c0486008224dfaff8f0ee81f (patch) | |
| tree | 25e88c8ee236c07ea01614e908fe7c08392435d1 /libavformat/utils.c | |
| parent | 73447eb4bdba11bf23367f115f1a0ce46ce6f1df (diff) | |
| download | ffmpeg-569129a6dc503379c0486008224dfaff8f0ee81f.tar.gz | |
lavf: add avformat_new_stream as a replacement for av_new_stream.
It takes a codec parameter, thus enabling codec-specific defaults.
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 6393b62615..9735d455d9 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2657,8 +2657,18 @@ void av_close_input_file(AVFormatContext *s) avio_close(pb); } +#if FF_API_NEW_STREAM AVStream *av_new_stream(AVFormatContext *s, int id) { + AVStream *st = avformat_new_stream(s, NULL); + if (st) + st->id = id; + return st; +} +#endif + +AVStream *avformat_new_stream(AVFormatContext *s, AVCodec *c) +{ AVStream *st; int i; AVStream **streams; @@ -2678,13 +2688,12 @@ AVStream *av_new_stream(AVFormatContext *s, int id) return NULL; } - st->codec = avcodec_alloc_context3(NULL); + st->codec = avcodec_alloc_context3(c); if (s->iformat) { /* no default bitrate if decoding */ st->codec->bit_rate = 0; } st->index = s->nb_streams; - st->id = id; st->start_time = AV_NOPTS_VALUE; st->duration = AV_NOPTS_VALUE; /* we set the current DTS to 0 so that formats without any timestamps |