diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-05-24 09:27:37 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-05-24 09:27:37 +0000 |
| commit | 1c7029d9de106f5c8ffe5a5dbdafbede86344cfe (patch) | |
| tree | a1810a2470e5c245d8aab584e4d28d61124df0c4 | |
| parent | c24d48070d2c032f89a69a8022cc2dae21f6bb70 (diff) | |
| download | usdx-1c7029d9de106f5c8ffe5a5dbdafbede86344cfe.tar.gz usdx-1c7029d9de106f5c8ffe5a5dbdafbede86344cfe.tar.xz usdx-1c7029d9de106f5c8ffe5a5dbdafbede86344cfe.zip | |
cosmetics: long variable names. no code change.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2890 b956fd51-792f-4845-bead-9b4dfca2ff2c
| -rw-r--r-- | src/media/UAudioDecoder_FFmpeg.pas | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/media/UAudioDecoder_FFmpeg.pas b/src/media/UAudioDecoder_FFmpeg.pas index ccec7090..46ff0806 100644 --- a/src/media/UAudioDecoder_FFmpeg.pas +++ b/src/media/UAudioDecoder_FFmpeg.pas @@ -690,8 +690,8 @@ var ErrorCode: integer; StartSilence: double; // duration of silence at start of stream StartSilencePtr: PDouble; // pointer for the EMPTY status packet - fs: integer; - ue: integer; + fileSize: integer; + urlError: integer; // Note: pthreads wakes threads waiting on a mutex in the order of their // priority and not in FIFO order. SDL does not provide any option to @@ -838,11 +838,11 @@ begin // check for errors {$IF (LIBAVFORMAT_VERSION >= 52103000)} - ue := ByteIOCtx^.error; + urlError := ByteIOCtx^.error; {$ELSE} - ue := url_ferror(ByteIOCtx); + urlError := url_ferror(ByteIOCtx); {$IFEND} - if (ue <> 0) then + if (urlError <> 0) then begin // an error occured -> abort and wait for repositioning or termination fPacketQueue.PutStatus(PKT_STATUS_FLAG_ERROR, nil); @@ -852,11 +852,11 @@ begin // url_feof() does not detect an EOF for some files // so we have to do it this way. {$IF (LIBAVFORMAT_VERSION >= 53009000)} - fs := avio_size(fFormatCtx^.pb); + fileSize := avio_size(fFormatCtx^.pb); {$ELSE} - fs := fFormatCtx^.file_size; + fileSize := fFormatCtx^.file_size; {$IFEND} - if ((fs <> 0) and (ByteIOCtx^.pos >= fs)) then + if ((fileSize <> 0) and (ByteIOCtx^.pos >= fileSize)) then begin fPacketQueue.PutStatus(PKT_STATUS_FLAG_EOF, nil); Exit; |