Changeset 2060 for branches/blt4/src

Timestamp:

Jan 24, 2011, 8:19:44 PM (14 years ago)

Author:

gah

Message:

 

File:

• branches/blt4/src/objects/RpVideo.c (modified) (2 diffs)

branches/blt4/src/objects/RpVideo.c

@@ -705 +705 @@
                     global_video_pkt_pts = packet.pts;
 
+#ifdef FFMPEG_AVCODEC_H
+                    // old avcodec decode video function
                     avcodec_decode_video(vcodecCtx, vidPtr->pFrameYUV,
                         &frameFinished, packet.data, packet.size);
-
-                    // avcodec_decode_video2(vcodecCtx, vidPtr->pFrameYUV,
-                    //    &frameFinished, &packet);
+#else
+                    // new avcodec decode video function
+                    avcodec_decode_video2(vcodecCtx, vidPtr->pFrameYUV,
+                        &frameFinished, &packet);
+#endif
 
                     if (packet.dts == AV_NOPTS_VALUE
@@ -1238 +1242 @@
     width = (*num)*width;
     height = (*den)*height;
+#ifdef FFMPEG_COMMON_H
+    // old gcd function
+    gcd = ff_gcd(FFABS(width), FFABS(height));
+#else
+    // new gcd function
     gcd = av_gcd(FFABS(width), FFABS(height));
+#endif
+
 
     *num = width/gcd;