summaryrefslogtreecommitdiffstats
path: root/src/jogl/native/libav/ffmpeg_dshow.c
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-08-30 09:38:01 +0200
committerSven Gothel <[email protected]>2013-08-30 09:38:01 +0200
commite1883b6402231044cc6bdf67a45c1b3610e34535 (patch)
tree3d47d0d99ef32a2bad94bd40ca5c37d8ab70632b /src/jogl/native/libav/ffmpeg_dshow.c
parenteca6a5cb1e2beda84dfbafc31ed225e272f4f3fb (diff)
FFMPEGMediaPlayer: Handle v-flipped 'bottom-up' pictures ; Refine API doc 'camera ID'
If linesize is < 0, it is not invalid as assumed in commit eca6a5cb1e2beda84dfbafc31ed225e272f4f3fb, but vertically flipped (bottom-up). We have to adjust the data pointers, which are moved to the upper end of memory as well and can proceed as usual. TODO: - Update texture 'mustFlipVertically' to 'false' in this case. - Later: - Allow updating texture size .. - Whole pixel-fmt/texture-lookup-shader association must scale better, i.e. extract the 'knowledge' into one class, use a static shader code using uniforms instead of hard-coded values .. etc.
Diffstat (limited to 'src/jogl/native/libav/ffmpeg_dshow.c')
-rw-r--r--src/jogl/native/libav/ffmpeg_dshow.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jogl/native/libav/ffmpeg_dshow.c b/src/jogl/native/libav/ffmpeg_dshow.c
index 4f8fedb9f..8c9903d6b 100644
--- a/src/jogl/native/libav/ffmpeg_dshow.c
+++ b/src/jogl/native/libav/ffmpeg_dshow.c
@@ -123,11 +123,11 @@ static int GetDeviceInformation(IEnumMoniker *pEnum, int verbose, int devIdx,
getBSTRChars(var.bstrVal, pName, nameSize);
}
if( verbose ) {
- fprintf(stderr, "DShowParser: Dev[%d]: FName %S\n", i, var.bstrVal);
+ fprintf(stderr, "DShowParser: Dev[%d]: Name %S\n", i, var.bstrVal);
}
VariantClear(&var);
} else if( verbose ) {
- fprintf(stderr, "DShowParser: Dev[%d]: cannot read FName..\n", i);
+ fprintf(stderr, "DShowParser: Dev[%d]: cannot read Name..\n", i);
}
hr = pPropBag->lpVtbl->Write(pPropBag, L"FriendlyName", &var);