diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 17:47:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 17:47:12 +0200 |
| commit | 2d70282254834b276ab5eea44dba694f98551c79 (patch) | |
| tree | 57c8bc8f4c248c001eca910f13c26cee3fcf8437 /libavformat/nutenc.c | |
| parent | 95398aa9499bfad3330b47001b7eb086c31b0cd6 (diff) | |
| parent | d754ed41727b1fcbab335b510248a9758a73320c (diff) | |
| download | ffmpeg-2d70282254834b276ab5eea44dba694f98551c79.tar.gz | |
Merge commit 'd754ed41727b1fcbab335b510248a9758a73320c'
* commit 'd754ed41727b1fcbab335b510248a9758a73320c':
riffenc: take an AVStream instead of an AVCodecContext
Conflicts:
libavformat/nutenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nutenc.c')
| -rw-r--r-- | libavformat/nutenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index b7ea286338..5db380f752 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -722,7 +722,7 @@ static int nut_write_header(AVFormatContext *s) AVStream *st = s->streams[i]; int ssize; AVRational time_base; - ff_parse_specific_params(st->codec, &time_base.den, &ssize, &time_base.num); + ff_parse_specific_params(st, &time_base.den, &ssize, &time_base.num); if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && st->codec->sample_rate) { time_base = (AVRational) {1, st->codec->sample_rate}; |