aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vp56dsp.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-10 22:30:43 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-10 22:31:39 +0200
commit55231323b0fdc84a529418d673148cf1f3157229 (patch)
tree1771ba123fc921a3ff05868b00243ec876802666 /libavcodec/vp56dsp.h
parent73b8155b31ec7ad1132ecf5c45ac82acadeb28e5 (diff)
parent254f3daba4271c1918d9a7ad155b1442ef93ed29 (diff)
downloadffmpeg-55231323b0fdc84a529418d673148cf1f3157229.tar.gz
Merge commit '254f3daba4271c1918d9a7ad155b1442ef93ed29'
* commit '254f3daba4271c1918d9a7ad155b1442ef93ed29': nut: Make sure to clean up on read_header failure Conflicts: libavformat/nutdec.c See: 361702660d2c37a63b7d6381d39e1e1de8405260 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp56dsp.h')
0 files changed, 0 insertions, 0 deletions