diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 17:29:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 17:52:06 +0100 |
| commit | b44456c908965231160f9b8f88de8c0dc447aa1f (patch) | |
| tree | cf4b07c005db8e7a9dd879f361b73bd0cbdced3f /libavformat/nutenc.c | |
| parent | 3c831fba08698293034db5ecaf8d74aa5fe453f8 (diff) | |
| parent | 80a11de7dca315505bf203ce9c8c016e71724fd2 (diff) | |
| download | ffmpeg-b44456c908965231160f9b8f88de8c0dc447aa1f.tar.gz | |
Merge commit '80a11de7dca315505bf203ce9c8c016e71724fd2'
* commit '80a11de7dca315505bf203ce9c8c016e71724fd2':
nutenc: do not use has_b_frames
Conflicts:
libavformat/nutenc.c
tests/ref/lavf/nut
tests/ref/seek/lavf-nut
Mostly not merged, this is simply not correct
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nutenc.c')
| -rw-r--r-- | libavformat/nutenc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index c335e6455a..3146f8927f 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -168,6 +168,7 @@ static void build_frame_code(AVFormatContext *s) int start2 = start + (end - start) * stream_id / s->nb_streams; int end2 = start + (end - start) * (stream_id + 1) / s->nb_streams; AVCodecContext *codec = s->streams[stream_id]->codec; + const AVCodecDescriptor *desc = avcodec_descriptor_get(codec->codec_id); int is_audio = codec->codec_type == AVMEDIA_TYPE_AUDIO; int intra_only = /*codec->intra_only || */ is_audio; int pred_count; @@ -419,6 +420,7 @@ static int write_streamheader(AVFormatContext *avctx, AVIOContext *bc, { NUTContext *nut = avctx->priv_data; AVCodecContext *codec = st->codec; + const AVCodecDescriptor *desc = avcodec_descriptor_get(codec->codec_id); ff_put_v(bc, i); switch (codec->codec_type) { |