summaryrefslogtreecommitdiffstats
path: root/mpeglib/lib/mpegplay/videoDecoder.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
commitb1057f437bf65300831a0ccb45b920787c6b318d (patch)
treef8a73db06ca1180d0da0ba6dfbe786197b4f4bc3 /mpeglib/lib/mpegplay/videoDecoder.cpp
parent4ddfca384ced9ad654213aef9dc2c3973720b980 (diff)
downloadtdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.tar.gz
tdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.zip
TQt4 port kdemultimedia
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'mpeglib/lib/mpegplay/videoDecoder.cpp')
-rw-r--r--mpeglib/lib/mpegplay/videoDecoder.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/mpeglib/lib/mpegplay/videoDecoder.cpp b/mpeglib/lib/mpegplay/videoDecoder.cpp
index b1971795..b7144291 100644
--- a/mpeglib/lib/mpegplay/videoDecoder.cpp
+++ b/mpeglib/lib/mpegplay/videoDecoder.cpp
@@ -69,7 +69,7 @@ VideoDecoder::~VideoDecoder() {
*
* mpegVidRsrc --
*
- * Parses bit stream until MB_QUANTUM number of
+ * Parses bit stream until MB_TQUANTUM number of
* macroblocks have been decoded or current slice or
* picture ends, whichever comes first. If the start
* of a frame is encountered, the frame is time stamped
@@ -121,7 +121,7 @@ int VideoDecoder::mpegVidRsrc(PictureArray* pictureArray) {
mpegVideoStream->flushBits(32);
packet->read_sys(data,vid_stream->bufferReader);
*/
- case SEQ_END_CODE:
+ case SETQ_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 SEQ_START_CODE:
+ case SETQ_START_CODE:
/* Sequence start code. Parse sequence header. */
if (ParseSeqHead() == false) {
- printf("SEQ_START_CODE 1-error\n");
+ printf("SETQ_START_CODE 1-error\n");
goto error;
}
goto done;
@@ -204,8 +204,8 @@ int VideoDecoder::mpegVidRsrc(PictureArray* pictureArray) {
break;
}
- /* Parse next MB_QUANTUM macroblocks. */
- for (i = 0; i < MB_QUANTUM; i++) {
+ /* Parse next MB_TQUANTUM macroblocks. */
+ for (i = 0; i < MB_TQUANTUM; i++) {
/* Check to see if actually a startcode and not a macroblock. */
data=mpegVideoStream->showBits(23);
@@ -232,7 +232,7 @@ int VideoDecoder::mpegVidRsrc(PictureArray* pictureArray) {
}
}
data=mpegVideoStream->showBits(23);
- /* Check if we just finished a picture on the MB_QUANTUM macroblock */
+ /* Check if we just finished a picture on the MB_TQUANTUM macroblock */
if (data == 0x0) {
mpegVideoStream->next_start_code();