aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/dualinput.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-04 13:15:00 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-04 13:15:22 +0200
commit44d884f036fa8147e8a16d2753c379198a5d5a6b (patch)
tree14bde7708355395ab2f8f6fb2592ed2f5da0310a /libavfilter/dualinput.c
parent49f5519345d2cf803b082bca8a7c54a63a34865b (diff)
parent7f9e893f56db52078e0f46677ed337b2e25fa94d (diff)
downloadffmpeg-44d884f036fa8147e8a16d2753c379198a5d5a6b.tar.gz
Merge commit '7f9e893f56db52078e0f46677ed337b2e25fa94d'
* commit '7f9e893f56db52078e0f46677ed337b2e25fa94d': build: Report an error message when a pc file is not found Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/dualinput.c')
0 files changed, 0 insertions, 0 deletions