aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/bfin/mathops.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-29 14:58:49 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-29 14:58:49 +0100
commit5068bcda95c2a53a9b27d096e52f72f9bac62c8b (patch)
treefcd68d78aaf62d7e59cb1d8be708b8621e6a144c /libavcodec/bfin/mathops.h
parentd1bbd304bf608c9ca5fe747a8ee317e4c4e0ecbe (diff)
parent7194330bcd6db8dc5c22e0c162a0992d519307f9 (diff)
downloadffmpeg-5068bcda95c2a53a9b27d096e52f72f9bac62c8b.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: vf_delogo: fix copying the input frame. Conflicts: libavfilter/vf_delogo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bfin/mathops.h')
0 files changed, 0 insertions, 0 deletions