summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-12 22:13:48 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-12 22:13:48 +0000
commit8eee5488954a0529a421363c58f2dc5da1d92ab5 (patch)
tree7138ccddd4b3676d9c5b9172928c4f4fbd29aac8 /libmpdemux
parent92cbcb73112b6c4ae85f072d5627ca7f0a189781 (diff)
downloadmpv-8eee5488954a0529a421363c58f2dc5da1d92ab5.tar.bz2
mpv-8eee5488954a0529a421363c58f2dc5da1d92ab5.tar.xz
cosmetics: renamed variable amr as headersize, more meaningful; patch by Carl Eugen Hoyos
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22537 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_rtp.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp
index 14df29fb00..b49821a8e3 100644
--- a/libmpdemux/demux_rtp.cpp
+++ b/libmpdemux/demux_rtp.cpp
@@ -436,13 +436,13 @@ static demux_packet_t* getBuffer(demuxer_t* demuxer, demux_stream_t* ds,
// the demuxer's 'priv' field)
RTPState* rtpState = (RTPState*)(demuxer->priv);
ReadBufferQueue* bufferQueue = NULL;
- int amr = 0;
+ int headersize = 0;
if (ds == demuxer->video) {
bufferQueue = rtpState->videoBufferQueue;
} else if (ds == demuxer->audio) {
bufferQueue = rtpState->audioBufferQueue;
if (bufferQueue->readSource()->isAMRAudioSource())
- amr = 1;
+ headersize = 1;
} else {
fprintf(stderr, "(demux_rtp)getBuffer: internal error: unknown stream\n");
return NULL;
@@ -470,7 +470,7 @@ static demux_packet_t* getBuffer(demuxer_t* demuxer, demux_stream_t* ds,
// Schedule the read operation:
bufferQueue->blockingFlag = 0;
- bufferQueue->readSource()->getNextFrame(&dp->buffer[amr], MAX_RTP_FRAME_SIZE - amr,
+ bufferQueue->readSource()->getNextFrame(&dp->buffer[headersize], MAX_RTP_FRAME_SIZE - headersize,
afterReading, bufferQueue,
onSourceClosure, bufferQueue);
// Block ourselves until data becomes available:
@@ -478,7 +478,7 @@ static demux_packet_t* getBuffer(demuxer_t* demuxer, demux_stream_t* ds,
= bufferQueue->readSource()->envir().taskScheduler();
scheduler.doEventLoop(&bufferQueue->blockingFlag);
- if (amr)
+ if (headersize == 1) // amr
dp->buffer[0] =
((AMRAudioSource*)bufferQueue->readSource())->lastFrameHeader();