diff options
| author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-12-22 18:39:37 +0000 |
|---|---|---|
| committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-12-22 18:39:37 +0000 |
| commit | 513b9fc615de45378ec2f9403106767204ae3a45 (patch) | |
| tree | f6010d01ec97441ab3bdd213f34bd537615cd0e1 /mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_core.cpp | |
| parent | 4b14d84ad012a23f769ce7c030ee8ab2c389108d (diff) | |
| download | usdx-513b9fc615de45378ec2f9403106767204ae3a45.tar.gz usdx-513b9fc615de45378ec2f9403106767204ae3a45.tar.xz usdx-513b9fc615de45378ec2f9403106767204ae3a45.zip | |
replace asf... by AUDIO_SAMPLE_FORMAT_... constants
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2769 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_core.cpp')
| -rw-r--r-- | mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_core.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_core.cpp b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_core.cpp index 79f353e1..506387ba 100644 --- a/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_core.cpp +++ b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_core.cpp @@ -165,20 +165,20 @@ int MediaCore_FFmpeg::findAudioStreamIndex(AVFormatContext *formatCtx) const { bool MediaCore_FFmpeg::convertFFmpegToAudioFormat(SampleFormat ffmpegFormat, audioSampleFormat_t *format) const { switch (ffmpegFormat) { case SAMPLE_FMT_U8: - *format = asfU8; + *format = AUDIO_SAMPLE_FORMAT_U8; break; case SAMPLE_FMT_S16: - *format = asfS16; + *format = AUDIO_SAMPLE_FORMAT_S16; break; case SAMPLE_FMT_S32: - *format = asfS32; + *format = AUDIO_SAMPLE_FORMAT_S32; break; case SAMPLE_FMT_FLT: - *format = asfFloat; + *format = AUDIO_SAMPLE_FORMAT_FLOAT; break; #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(51,65,0) case SAMPLE_FMT_DBL: - *format = asfDouble; + *format = AUDIO_SAMPLE_FORMAT_DOUBLE; break; #endif default: |