aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice/dshow_capture.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-23 14:50:31 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-23 14:50:31 +0200
commitd0ac26a264e5b9d5d7d19efddd7205faf1e124d4 (patch)
tree707b773735563ba2dbde55b91ce0adc8f21a8903 /libavdevice/dshow_capture.h
parenta65bc2712db20207dc1065ba3e3e6fa341145d99 (diff)
parentc692957c4edd119920cd7f2121628dd183589e6a (diff)
downloadffmpeg-d0ac26a264e5b9d5d7d19efddd7205faf1e124d4.tar.gz
Merge commit 'c692957c4edd119920cd7f2121628dd183589e6a'
* commit 'c692957c4edd119920cd7f2121628dd183589e6a': lavu: remove disabled avoptions cruft lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft Conflicts: libavutil/opt.c libavutil/opt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/dshow_capture.h')
0 files changed, 0 insertions, 0 deletions