diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-27 23:45:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-27 23:45:22 +0100 |
| commit | c94ed2a729649f614dc433032b3b3ca189057644 (patch) | |
| tree | 60aba0aaf5da0547d85e06855eb8f621e66fc753 /libavdevice/alldevices.c | |
| parent | 673ce8e46ae229c0f1c72fc9a48ce16dd360e3ab (diff) | |
| parent | ded6b3af41cd5d41f4df728ced4b194cf0426105 (diff) | |
| download | ffmpeg-c94ed2a729649f614dc433032b3b3ca189057644.tar.gz | |
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd: add opengl device
lavd: add avdevice_dev_to_app_control_message API
lavd: add avdevice_app_to_dev_control_message API
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/alldevices.c')
| -rw-r--r-- | libavdevice/alldevices.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index 5178f30861..63bff11b8d 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -56,6 +56,7 @@ void avdevice_register_all(void) REGISTER_INDEV (JACK, jack); REGISTER_INDEV (LAVFI, lavfi); REGISTER_INDEV (OPENAL, openal); + REGISTER_OUTDEV (OPENGL, opengl); REGISTER_INOUTDEV(OSS, oss); REGISTER_INOUTDEV(PULSE, pulse); REGISTER_OUTDEV (SDL, sdl); |