aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/hpel_template.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-23 23:44:57 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-23 23:52:37 +0100
commit76241c911510ae3eaccf92a21e95b82579dc1ec5 (patch)
tree7aeeaef59974db0bda6c3364644dc1dc003d7a83 /libavcodec/hpel_template.c
parenta915b1daee3ba99306d79100d5e973549b48a891 (diff)
parentb587ec00f7b6df7c46efd115a544c0686bcbd833 (diff)
downloadffmpeg-76241c911510ae3eaccf92a21e95b82579dc1ec5.tar.gz
Merge remote-tracking branch 'rdp/dshow_crossbar'
* rdp/dshow_crossbar: dshow: fix docu escapes dshow: some devices only list themselves under "Video sources" but actually have both video and audio output pins, so make the audio pins accessible by video source name. dshow: add options for allowing filter popup configuration dialogs to be presented to the user dshow: introduce support for crossbar [multiple input selectable] devices dshow: drop initial audio packets with weird timestamps dshow: use non deprecated api dshow: miscellaneous tweaks dshow: allow selecting devices by an alternative name (workaround for devices with symbols in them), allow specifying capture pins by name and alternative (unique) name Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hpel_template.c')
0 files changed, 0 insertions, 0 deletions