aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/assenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-22 04:00:56 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-22 04:02:25 +0100
commitcff55cfe17ec396dd88aea20566ec0b8f27f222c (patch)
tree4f5d1aa5463d36407097eb046d76fd3b0126f56f /libavcodec/assenc.c
parentc75681aba343912c8878705448ad470a1bba2191 (diff)
parent27aa1ff35a13bc471c6e0a9cc496ec3f62f1574f (diff)
downloadffmpeg-cff55cfe17ec396dd88aea20566ec0b8f27f222c.tar.gz
Merge commit '27aa1ff35a13bc471c6e0a9cc496ec3f62f1574f'
* commit '27aa1ff35a13bc471c6e0a9cc496ec3f62f1574f': oggdec: Check memory allocation Conflicts: libavformat/oggdec.c See: 9b8152bf047bbebe4495b993258591687bcdd36d an others Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/assenc.c')
0 files changed, 0 insertions, 0 deletions