aboutsummaryrefslogtreecommitdiffstats
path: root/tools/aviocat.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-24 14:58:06 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-24 14:58:06 +0100
commit56c245f9219b26c60f1c4563300f73d5cc3464a7 (patch)
tree6b9ea9a4b60d31b96d9cd8b7486b49a534837daa /tools/aviocat.c
parent74c92452541bc50e1835ba5370c0a5c56b164232 (diff)
parent9840130edf3a969ec06dd0faa61dcf8d90c5f67a (diff)
downloadffmpeg-56c245f9219b26c60f1c4563300f73d5cc3464a7.tar.gz
Merge commit '9840130edf3a969ec06dd0faa61dcf8d90c5f67a'
* commit '9840130edf3a969ec06dd0faa61dcf8d90c5f67a': configure: Simplify VDA header and extralibs check Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/aviocat.c')
0 files changed, 0 insertions, 0 deletions