diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-14 02:24:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-14 02:24:17 +0100 |
| commit | b61658829b2f94126196b0accca4e4703fba2c1f (patch) | |
| tree | 852590abd4ee62ce6c0e1aaee7865ff755569fcf /libavcodec/g722enc.c | |
| parent | 9f088712d4544768e57183f5f21678c60c60fa11 (diff) | |
| parent | 15b02ddee033aec69e75e2c1cdc3de085133d959 (diff) | |
| download | ffmpeg-b61658829b2f94126196b0accca4e4703fba2c1f.tar.gz | |
Merge remote-tracking branch 'lippit/master'
* lippit/master:
Update iec61883 to handle multiple devices, and allow selection of DV device by its GUID
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722enc.c')
0 files changed, 0 insertions, 0 deletions