Changeset 2720 for trunk/src/objects

Timestamp:

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

Author:

gah

Message:

 

File:

• trunk/src/objects/RpVideo.c (modified) (3 diffs)

trunk/src/objects/RpVideo.c

@@ -58 +58 @@
 #define AVMEDIA_TYPE_VIDEO      CODEC_TYPE_VIDEO
 #define AV_PKT_FLAG_KEY         PKT_FLAG_KEY            
+#define avio_close              url_fclose
+#define avformat_open_input     av_open_input_file
 #endif  /* LIBAVUTIL_VERSION_MAJOR */
 
@@ -341 +343 @@
      * Open the video stream from that file.
      */
+#if LIBAVUTIL_VERSION_MAJOR < 51
     if (av_open_input_file(&vidPtr->pFormatCtx, vidPtr->fileName,
             NULL, 0, NULL) != 0) {
-        // Tcl_AppendResult(interp, "couldn't open file \"",
-        //     fileName, "\"", (char*)NULL);
-        // return TCL_ERROR;
-
-        // couldn't open file
         return -3;
     }
+#else
+    if (avformat_open_input(&vidPtr->pFormatCtx, vidPtr->fileName, NULL, 
+        NULL) != 0) {
+        return -3;
+    }
+#endif
     if (av_find_stream_info(vidPtr->pFormatCtx) < 0) {
         // Tcl_AppendResult(interp, "couldn't find streams in file \"",
@@ -1668 +1672 @@
 
         if (vidPtr->outFormatCtx->pb) {
-            url_fclose(vidPtr->outFormatCtx->pb);
+            avio_close(vidPtr->outFormatCtx->pb);
         }