summaryrefslogtreecommitdiffstats
path: root/mpeglib/lib
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2014-02-16 12:05:41 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2014-02-16 12:05:41 -0600
commitbfe2615471f3de55215e59b45ed677d15e19b688 (patch)
tree6438289f61965374e87035c9f164813659cddc6d /mpeglib/lib
parentdd73caa65d933da6576ede49ffb20b9a0cb07b60 (diff)
downloadtdemultimedia-bfe2615471f3de55215e59b45ed677d15e19b688.tar.gz
tdemultimedia-bfe2615471f3de55215e59b45ed677d15e19b688.zip
Fix unintended renaming
Diffstat (limited to 'mpeglib/lib')
-rw-r--r--mpeglib/lib/decoder/mpgPlugin.cpp2
-rw-r--r--mpeglib/lib/mpegplay/mpegSystemStream.cpp2
-rw-r--r--mpeglib/lib/mpegplay/mpegVideoStream.cpp8
-rw-r--r--mpeglib/lib/mpegplay/startCodes.h4
-rw-r--r--mpeglib/lib/mpegplay/videoDecoder.cpp6
5 files changed, 11 insertions, 11 deletions
diff --git a/mpeglib/lib/decoder/mpgPlugin.cpp b/mpeglib/lib/decoder/mpgPlugin.cpp
index 510accbd..fd7170c8 100644
--- a/mpeglib/lib/decoder/mpgPlugin.cpp
+++ b/mpeglib/lib/decoder/mpgPlugin.cpp
@@ -95,7 +95,7 @@ void MpgPlugin::decoder_loop() {
//cout << "still initializing system stream"<<endl;
} else {
// if we have found a raw stream,
- // make sure we pass as first argument a SETQ_START_CODE
+ // make sure we pass as first argument a SEQ_START_CODE
if (mpegSystemHeader->getLayer() == _PACKET_SYSLAYER) {
lSysLayer=true;
mpegStreamPlayer->processSystemHeader(mpegSystemHeader);
diff --git a/mpeglib/lib/mpegplay/mpegSystemStream.cpp b/mpeglib/lib/mpegplay/mpegSystemStream.cpp
index d4ec43a6..ca25d7e8 100644
--- a/mpeglib/lib/mpegplay/mpegSystemStream.cpp
+++ b/mpeglib/lib/mpegplay/mpegSystemStream.cpp
@@ -68,7 +68,7 @@ int MpegSystemStream::firstInitialize(MpegSystemHeader* mpegHeader) {
}
mpegHeader->setHeader(syncCode);
- // SETQ_START_CODE: 1b3
+ // SEQ_START_CODE: 1b3
if (mpegHeader->hasRAWHeader()) {
// If we found a seq_heade_start code we assume
// that we are a video only stream
diff --git a/mpeglib/lib/mpegplay/mpegVideoStream.cpp b/mpeglib/lib/mpegplay/mpegVideoStream.cpp
index 8ce1defd..5e16b116 100644
--- a/mpeglib/lib/mpegplay/mpegVideoStream.cpp
+++ b/mpeglib/lib/mpegplay/mpegVideoStream.cpp
@@ -48,7 +48,7 @@ int MpegVideoStream::firstInitialize(MpegVideoHeader* mpegHeader) {
fill_videoBuffer(mpegSystemHeader);
lHasStream=true;
}
- // now find SETQ_START_CODE
+ // now find SEQ_START_CODE
hasBytes(4);
mpegVideoBitWindow->flushByteOffset();
@@ -70,8 +70,8 @@ int MpegVideoStream::firstInitialize(MpegVideoHeader* mpegHeader) {
int MpegVideoStream::isStartCode(unsigned int data) {
switch(data) {
- case SETQ_END_CODE:
- case SETQ_START_CODE:
+ case SEQ_END_CODE:
+ case SEQ_START_CODE:
case GOP_START_CODE:
case PICTURE_START_CODE:
case SLICE_MIN_START_CODE:
@@ -125,7 +125,7 @@ int MpegVideoStream::nextPIC() {
unsigned int data=showBits(32);
if ( (data != PICTURE_START_CODE) &&
(data != GOP_START_CODE) &&
- (data != SETQ_START_CODE) ) {
+ (data != SEQ_START_CODE) ) {
flushBits(8);
return false;
}
diff --git a/mpeglib/lib/mpegplay/startCodes.h b/mpeglib/lib/mpegplay/startCodes.h
index 1164fe4e..c305a39f 100644
--- a/mpeglib/lib/mpegplay/startCodes.h
+++ b/mpeglib/lib/mpegplay/startCodes.h
@@ -29,8 +29,8 @@
/* Start codes. */
-#define SETQ_END_CODE 0x000001b7
-#define SETQ_START_CODE 0x000001b3
+#define SEQ_END_CODE 0x000001b7
+#define SEQ_START_CODE 0x000001b3
#define GOP_START_CODE 0x000001b8
#define PICTURE_START_CODE 0x00000100
#define SLICE_MIN_START_CODE 0x00000101
diff --git a/mpeglib/lib/mpegplay/videoDecoder.cpp b/mpeglib/lib/mpegplay/videoDecoder.cpp
index 427e06c2..b1971795 100644
--- a/mpeglib/lib/mpegplay/videoDecoder.cpp
+++ b/mpeglib/lib/mpegplay/videoDecoder.cpp
@@ -121,7 +121,7 @@ int VideoDecoder::mpegVidRsrc(PictureArray* pictureArray) {
mpegVideoStream->flushBits(32);
packet->read_sys(data,vid_stream->bufferReader);
*/
- case SETQ_END_CODE:
+ case SEQ_END_CODE:
case ISO_11172_END_CODE: /* handle ISO_11172_END_CODE too */
/* Display last frame. */
@@ -148,11 +148,11 @@ int VideoDecoder::mpegVidRsrc(PictureArray* pictureArray) {
mpegVideoStream->next_start_code();
break;
- case SETQ_START_CODE:
+ case SEQ_START_CODE:
/* Sequence start code. Parse sequence header. */
if (ParseSeqHead() == false) {
- printf("SETQ_START_CODE 1-error\n");
+ printf("SEQ_START_CODE 1-error\n");
goto error;
}
goto done;