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 /libavcodec/avcodec.h | |
| 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 'libavcodec/avcodec.h')
0 files changed, 0 insertions, 0 deletions