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/avienc.c | |
| parent | 95398aa9499bfad3330b47001b7eb086c31b0cd6 (diff) | |
| parent | d754ed41727b1fcbab335b510248a9758a73320c (diff) | |
| download | ffmpeg-streaming-2d70282254834b276ab5eea44dba694f98551c79.zip ffmpeg-streaming-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/avienc.c')
| -rw-r--r-- | libavformat/avienc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/avienc.c b/libavformat/avienc.c index b6a329d..461d3aa 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -131,7 +131,7 @@ static int avi_write_counters(AVFormatContext *s, int riff_id) av_assert0(avist->frames_hdr_strm); stream = s->streams[n]->codec; avio_seek(pb, avist->frames_hdr_strm, SEEK_SET); - ff_parse_specific_params(stream, &au_byterate, &au_ssize, &au_scale); + ff_parse_specific_params(s->streams[n], &au_byterate, &au_ssize, &au_scale); if (au_ssize == 0) avio_wl32(pb, avist->packet_count); else @@ -260,7 +260,7 @@ static int avi_write_header(AVFormatContext *s) avio_wl16(pb, 0); /* language */ avio_wl32(pb, 0); /* initial frame */ - ff_parse_specific_params(enc, &au_byterate, &au_ssize, &au_scale); + ff_parse_specific_params(st, &au_byterate, &au_ssize, &au_scale); if ( enc->codec_type == AVMEDIA_TYPE_VIDEO && enc->codec_id != AV_CODEC_ID_XSUB |
