aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mpcdata.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-06 19:33:46 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-06 19:33:46 +0200
commit66328da700c73246e2d4c5254905f9e5b4e0fa31 (patch)
tree7995096ae19997f784130738c2c5b87d2147793a /libavcodec/mpcdata.h
parentc32db6adab9942781cc5a23f62abb839a5595a83 (diff)
parent6fb65973c9501d3fe94a5a9195c01cd20083066e (diff)
downloadffmpeg-66328da700c73246e2d4c5254905f9e5b4e0fa31.tar.gz
Merge commit '6fb65973c9501d3fe94a5a9195c01cd20083066e'
* commit '6fb65973c9501d3fe94a5a9195c01cd20083066e': configure: Properly split dv1394 indev dependencies Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpcdata.h')
0 files changed, 0 insertions, 0 deletions