aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/filtfmts.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-09 12:48:48 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-09 12:49:05 +0100
commit4e6f1df657224d560691246cee4d596e8760fa9d (patch)
tree490c3043e86f31ae25e1164fbab8b5c0bd20ae08 /libavfilter/filtfmts.c
parentbec350611eb1a7a5f7db402e8e86e8e0f985c0d8 (diff)
parent0ad8d751337efbbd61c0d78762448b043100b653 (diff)
downloadffmpeg-4e6f1df657224d560691246cee4d596e8760fa9d.tar.gz
Merge commit '0ad8d751337efbbd61c0d78762448b043100b653' into release/2.2
* commit '0ad8d751337efbbd61c0d78762448b043100b653': configure: Properly fail when libcdio/cdparanoia is not found Conflicts: configure See: f514b5dff769a331ea2153c23594d9b29b667141 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/filtfmts.c')
0 files changed, 0 insertions, 0 deletions