diff options
| author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-10-01 12:28:15 +0000 |
|---|---|---|
| committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-10-01 12:28:15 +0000 |
| commit | 08a0ddf3d8f9eb819e03d9cd6c8d79bd8634fec6 (patch) | |
| tree | b69df695577ecfecc3c12805faa49bd3b4d53576 /src/media | |
| parent | 392718a615f10c62e710eca46a095cb37928fe1b (diff) | |
| download | usdx-08a0ddf3d8f9eb819e03d9cd6c8d79bd8634fec6.tar.gz usdx-08a0ddf3d8f9eb819e03d9cd6c8d79bd8634fec6.tar.xz usdx-08a0ddf3d8f9eb819e03d9cd6c8d79bd8634fec6.zip | |
- FFmpeg header update
- update to newest revision
- if linked libs are too new, USDX will not compile anymore and display an error message (to avoid mysterious crashes if an unsupported version of FFmpeg is used)
- comment change in UVisualizer.pas
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1428 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/media')
| -rw-r--r-- | src/media/UMediaCore_FFmpeg.pas | 2 | ||||
| -rw-r--r-- | src/media/UVisualizer.pas | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/media/UMediaCore_FFmpeg.pas b/src/media/UMediaCore_FFmpeg.pas index e57760d6..9ad19a5b 100644 --- a/src/media/UMediaCore_FFmpeg.pas +++ b/src/media/UMediaCore_FFmpeg.pas @@ -209,9 +209,9 @@ begin case FFmpegFormat of SAMPLE_FMT_U8: Format := asfU8; SAMPLE_FMT_S16: Format := asfS16; - SAMPLE_FMT_S24: Format := asfS24; SAMPLE_FMT_S32: Format := asfS32; SAMPLE_FMT_FLT: Format := asfFloat; + SAMPLE_FMT_DBL: Format := asfDouble; else begin Result := false; Exit; diff --git a/src/media/UVisualizer.pas b/src/media/UVisualizer.pas index c33a4a09..a81e3e52 100644 --- a/src/media/UVisualizer.pas +++ b/src/media/UVisualizer.pas @@ -287,7 +287,7 @@ begin if VisualizerStarted then Exit; - // the OpenGL state must be saved before + // the OpenGL state must be saved before TProjectM.Create is called SaveOpenGLState(); try |