aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice/timefilter.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-20 15:55:29 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-20 15:55:29 +0200
commitf6dcd844ee65b187b7b352e3740c43724175b3e1 (patch)
tree58447edbac4f928569f73e943cfaebabd0bf3130 /libavdevice/timefilter.c
parentc3624cfe7638e41891cebf08c3381036adc8a9cd (diff)
parent619e0da19119bcd683f135fe9a164f37c0ca70d1 (diff)
downloadffmpeg-f6dcd844ee65b187b7b352e3740c43724175b3e1.tar.gz
Merge commit '619e0da19119bcd683f135fe9a164f37c0ca70d1'
* commit '619e0da19119bcd683f135fe9a164f37c0ca70d1': dsputil: Remove unused 32-bit functions Conflicts: libavcodec/dsputil.c libavcodec/dsputil_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/timefilter.c')
0 files changed, 0 insertions, 0 deletions