aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/ivfenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-30 21:33:00 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-30 21:33:00 +0200
commite9d646f44c6a3208e35a055ba2154f25ba497fa2 (patch)
tree2aadac553f0b26b3392235376d992eaab4ec087f /libavformat/ivfenc.c
parent7d1cfbbc3e8405a185611eb1132bd3d3a98b9f55 (diff)
parent0181ae9af2de1526464d23209b82e6674d362f5d (diff)
downloadffmpeg-e9d646f44c6a3208e35a055ba2154f25ba497fa2.tar.gz
Merge commit '0181ae9af2de1526464d23209b82e6674d362f5d'
* commit '0181ae9af2de1526464d23209b82e6674d362f5d': h264: Make sure reinit failures mark the context as not initialized Conflicts: libavcodec/h264_slice.c See: e8714f6f93d1a32f4e4655209960afcf4c185214 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ivfenc.c')
0 files changed, 0 insertions, 0 deletions