aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/aes.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-24 17:10:55 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-24 17:10:55 +0100
commit71cf094e1be086bce4c535b1fe0d96a0449486ae (patch)
treec1608e1f7216f00ac1485e6ee6a911ecfbcc0a52 /libavutil/aes.h
parentf7c4b76c488b4901133addb3f7875ef3ac4ae9c4 (diff)
parent9f1223562e134bac6345a465870b9d56ff7d60cf (diff)
downloadffmpeg-71cf094e1be086bce4c535b1fe0d96a0449486ae.tar.gz
Merge commit '9f1223562e134bac6345a465870b9d56ff7d60cf'
* commit '9f1223562e134bac6345a465870b9d56ff7d60cf': lavfi: connect libavresample options to af_resample via AVFilterGraph Conflicts: doc/APIchanges libavfilter/avfiltergraph.c libavfilter/avfiltergraph.h libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/aes.h')
0 files changed, 0 insertions, 0 deletions