aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample/resample_template.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-24 15:06:44 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-24 15:21:13 +0100
commit42b411995caf218ab8fb0506ad219a69eba36598 (patch)
tree6b9ea9a4b60d31b96d9cd8b7486b49a534837daa /libswresample/resample_template.c
parent56c245f9219b26c60f1c4563300f73d5cc3464a7 (diff)
parent2aac411fd4c74e22b978525206f3b8257de1842b (diff)
downloadffmpeg-42b411995caf218ab8fb0506ad219a69eba36598.tar.gz
Merge commit '2aac411fd4c74e22b978525206f3b8257de1842b'
* commit '2aac411fd4c74e22b978525206f3b8257de1842b': configure: Simplify VDPAU header check Conflicts: configure Not merged as the code seems not to work Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/resample_template.c')
0 files changed, 0 insertions, 0 deletions