aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-27 17:29:05 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-27 17:52:06 +0100
commitb44456c908965231160f9b8f88de8c0dc447aa1f (patch)
treecf4b07c005db8e7a9dd879f361b73bd0cbdced3f /libavcodec
parent3c831fba08698293034db5ecaf8d74aa5fe453f8 (diff)
parent80a11de7dca315505bf203ce9c8c016e71724fd2 (diff)
downloadffmpeg-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')
0 files changed, 0 insertions, 0 deletions