summaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/jogamp/opengl/util
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2015-10-05 13:51:51 +0200
committerSven Gothel <[email protected]>2015-10-05 13:51:51 +0200
commitc82ab4d75a50cd88c675e6c1e757dc9ed2db9655 (patch)
tree19c8c4364496d513311da3565bea88883e812d91 /src/jogl/classes/jogamp/opengl/util
parent9abd252b4d30e0611a360d37d228dbae427c9cd5 (diff)
Bug 1239: Support OSX input via 'avfoundation' ; Use remaining camera ID (index) as filename for OSX
Diffstat (limited to 'src/jogl/classes/jogamp/opengl/util')
-rw-r--r--src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java b/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java
index cd1400a29..e51984e37 100644
--- a/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java
+++ b/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java
@@ -346,12 +346,10 @@ public class FFMPEGMediaPlayer extends GLMediaPlayerImpl {
resStreamLocS = dev_video_linux + cameraPath.decode();
break;
case WINDOWS:
- resStreamLocS = cameraPath.decode();
- break;
case MACOS:
case OPENKODE:
default:
- resStreamLocS = streamLocS; // FIXME: ??
+ resStreamLocS = cameraPath.decode();
break;
}
if( null != cameraProps ) {