summaryrefslogtreecommitdiffstats
path: root/libavcodec/cavsdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-18 03:08:20 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-18 03:08:20 +0100
commit8426edef4cf521104bb9288ac46a48dc4bdaee53 (patch)
tree51a07cc48e411611ac25cd7e79f4850042a3cba5 /libavcodec/cavsdec.c
parent7384ec19cf13fe204317c1b88333c58cbfa6336a (diff)
parent771656bd85416cd6308b11aed6f2c69a8db9c21b (diff)
downloadffmpeg-streaming-8426edef4cf521104bb9288ac46a48dc4bdaee53.zip
ffmpeg-streaming-8426edef4cf521104bb9288ac46a48dc4bdaee53.tar.gz
Merge commit '771656bd85416cd6308b11aed6f2c69a8db9c21b'
* commit '771656bd85416cd6308b11aed6f2c69a8db9c21b': libvpxenc: clean memory on error Conflicts: libavcodec/libvpxenc.c See: 104b1d9e103f90485e894b20dd5bb3f1964fe5f3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cavsdec.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud