Changeset 2713 for branches/blt4/src

Timestamp:

Dec 2, 2011, 7:10:39 PM (13 years ago)

Author:

gah

Message:

 

Location:

branches/blt4/src/objects

Files:

• RpVideo.c (modified) (3 diffs)
• RpVideo.h (modified) (1 diff)

branches/blt4/src/objects/RpVideo.c

@@ -54 +54 @@
 
 #include "RpVideo.h"
+
+#if LIBAVUTIL_VERSION_MAJOR < 51
+#define AVMEDIA_TYPE_VIDEO      CODEC_TYPE_VIDEO
+#define AV_PKT_FLAG_KEY         PKT_FLAG_KEY            
+#endif  /* LIBAVUTIL_VERSION_MAJOR */
+
 
 /*
@@ -358 +364 @@
     vidPtr->videoStream = -1;
     for (i=0; i < vidPtr->pFormatCtx->nb_streams; i++) {
-        if (vidPtr->pFormatCtx->streams[i]->codec->codec_type
-                == CODEC_TYPE_VIDEO) {
+        if (vidPtr->pFormatCtx->streams[i]->codec->codec_type 
+            == AVMEDIA_TYPE_VIDEO) {
             vidPtr->videoStream = i;
             break;
@@ -1497 +1503 @@
         }
         if (codecCtx->coded_frame->key_frame) {
-            pkt.flags |= PKT_FLAG_KEY;
+            pkt.flags |= AV_PKT_FLAG_KEY;
         }
         pkt.stream_index = vidPtr->outVideoStr->index;

branches/blt4/src/objects/RpVideo.h

@@ -46 +46 @@
 }
 #endif
+