aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/lswsutils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-29 00:17:58 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-29 00:18:03 +0200
commit8b1e920676f6eeeb01422660768f5f92b3811bc6 (patch)
treee12162f3253d3a154facd7334c7a02768b0ca29a /libavfilter/lswsutils.c
parent4a4d0258eef26a8c7e93f68024b639290e1c8cb2 (diff)
parent259fe7280d0b63dc7a8ff017d44f26d3a84cfde8 (diff)
downloadffmpeg-8b1e920676f6eeeb01422660768f5f92b3811bc6.tar.gz
Merge commit '259fe7280d0b63dc7a8ff017d44f26d3a84cfde8'
* commit '259fe7280d0b63dc7a8ff017d44f26d3a84cfde8': mxf: Extract origin information from material and source track Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/lswsutils.c')
0 files changed, 0 insertions, 0 deletions