aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/wmv2dsp.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-28 22:02:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-28 22:02:41 +0200
commit7026d8accdb2d3b013fec5c7c7620f1b769e6c7b (patch)
tree0b48b19031c21354962ee60243977d46352871e9 /libavcodec/wmv2dsp.h
parentc508fef3c737321ad719db6ec62e1d011726baa8 (diff)
parent1b1bb2c4efc126d74d44d8c421860c85f932ecb1 (diff)
downloadffmpeg-7026d8accdb2d3b013fec5c7c7620f1b769e6c7b.tar.gz
Merge commit '1b1bb2c4efc126d74d44d8c421860c85f932ecb1'
* commit '1b1bb2c4efc126d74d44d8c421860c85f932ecb1': rl: Add error checking to ff_rl_init(). Conflicts: libavcodec/rl.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmv2dsp.h')
0 files changed, 0 insertions, 0 deletions