Changeset 2720 for trunk/packages

Timestamp:

Dec 6, 2011, 8:03:57 PM (13 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers/nanovis

Files:

• RpAVTranslate.cpp (modified) (10 diffs)
• nanovis.cpp (modified) (2 diffs)

trunk/packages/vizservers/nanovis/RpAVTranslate.cpp

@@ -34 +34 @@
 
 #include "RpAVTranslate.h"
+
+#if LIBAVUTIL_VERSION_MAJOR < 51
+#define AVMEDIA_TYPE_VIDEO      CODEC_TYPE_VIDEO
+#define AV_PKT_FLAG_KEY         PKT_FLAG_KEY            
+#define av_guess_format         guess_format
+#define av_dump_format          dump_format
+#define avio_open               url_fopen       
+#define avio_close              url_fclose      
+#endif  /* LIBAVUTIL_VERSION_MAJOR */
 
 #ifndef M_PI
@@ -101 +110 @@
 
     /* Auto detect the output format from the name. default is mpeg. */
-    _fmtPtr = guess_format(NULL, filename, NULL);
+    _fmtPtr = av_guess_format(NULL, filename, NULL);
     if (_fmtPtr == NULL) {
         /*
@@ -107 +116 @@
                  "file extension: using MPEG.\n");
         */
-        _fmtPtr = guess_format("mpeg", NULL, NULL);
+        _fmtPtr = av_guess_format("mpeg", NULL, NULL);
     }
     if (_fmtPtr == NULL) {
@@ -136 +145 @@
     }
 
+#if LIBAVUTIL_VERSION_MAJOR < 51
     /* Set the output parameters (must be done even if no parameters). */
     if (av_set_parameters(_ocPtr, NULL) < 0) {
@@ -141 +151 @@
         return false;
     }
-
-    dump_format(_ocPtr, 0, filename, 1);
+#endif
+    av_dump_format(_ocPtr, 0, filename, 1);
 
     /* Now that all the parameters are set, we can open the video codec and
@@ -154 +164 @@
     /* Open the output file, if needed. */
     if (!(_fmtPtr->flags & AVFMT_NOFILE)) {
-        if (url_fopen(&_ocPtr->pb, filename, URL_WRONLY) < 0) {
+        if (avio_open(&_ocPtr->pb, filename, URL_WRONLY) < 0) {
             status.addError("Could not open '%s'", filename);
             return false;
@@ -161 +171 @@
 
     /* write the stream header, if any */
+#if LIBAVUTIL_VERSION_MAJOR < 51
     av_write_header(_ocPtr);
+#else
+    avformat_write_header(_ocPtr, NULL);
+#endif
     return true;
 }
@@ -226 +240 @@
     if (!(_fmtPtr->flags & AVFMT_NOFILE)) {
         /* close the output file */
-        url_fclose(_ocPtr->pb);
+        avio_close(_ocPtr->pb);
     }
 
@@ -257 +271 @@
     codecPtr = streamPtr->codec;
     codecPtr->codec_id = codec_id;
-    codecPtr->codec_type = CODEC_TYPE_VIDEO;
+    codecPtr->codec_type = AVMEDIA_TYPE_VIDEO;
 
     /* Put sample parameters */
@@ -393 +407 @@
                            _avStreamPtr->time_base);
     if (codecPtr->coded_frame->key_frame) {
-        pkt.flags |= PKT_FLAG_KEY;
+        pkt.flags |= AV_PKT_FLAG_KEY;
     }
     pkt.stream_index = _avStreamPtr->index;

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -754 +754 @@
 
     if(lastError) {
-        const char *listing = cgGetLastListing(g_context);
         TRACE("\n---------------------------------------------------\n");
         TRACE("%s\n\n", cgGetErrorString(lastError));
-        TRACE("%s\n", listing);
+        TRACE("%s\n", cgGetLastListing(g_context));
         TRACE("-----------------------------------------------------\n");
         TRACE("Cg error, exiting...\n");
@@ -2249 +2248 @@
     char *newPath;
     struct timeval tv;
-        int n, i;
     newPath = NULL;
     path = NULL;