Changeset 2f322e1f19b0ea622f5970f80d69eaa67bbcb836

Timestamp:

10/05/05 12:38:35 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1115721515 +0000

git-parent:

[d32d1ee048f47f34457f1c8529915569d7c7c07a]

git-author:

Gildas Bazin <gbazin@videolan.org> 1115721515 +0000

Message:

* modules/codec/ffmpeg/*, modules/stream_out/switcher.c: fix compilation with new ffmpeg versions (use native timebase).

Files:

• modules/codec/ffmpeg/encoder.c (modified) (1 diff)
• modules/codec/ffmpeg/video.c (modified) (4 diffs)
• modules/stream_out/switcher.c (modified) (1 diff)

modules/codec/ffmpeg/encoder.c

@@ -329 +329 @@
-        p_context->height = p_enc->fmt_in.video.i_height;
-
+#if LIBAVCODEC_BUILD >= 4754
+        p_context->time_base.num = p_enc->fmt_in.video.i_frame_rate_base;
+        p_context->time_base.den = p_enc->fmt_in.video.i_frame_rate;
+#else
-        p_context->frame_rate = p_enc->fmt_in.video.i_frame_rate;
-        p_context->frame_rate_base= p_enc->fmt_in.video.i_frame_rate_base;
+#endif
-
-        /* Defaults from ffmpeg.c */

modules/codec/ffmpeg/video.c

@@ -187 +187 @@
-    }
-
+#if LIBAVCODEC_BUILD >= 4754
+    if( p_context->time_base.num > 0 && p_context->time_base.den > 0 )
+    {
+        p_dec->fmt_out.video.i_frame_rate = p_context->time_base.den;
+        p_dec->fmt_out.video.i_frame_rate_base = p_context->time_base.num;
+    }
+#else
-    if( p_context->frame_rate > 0 && p_context->frame_rate_base > 0 )
-    {
@@ -192 +199 @@
-        p_dec->fmt_out.video.i_frame_rate_base = p_context->frame_rate_base;
-    }
+#endif
-
-    p_pic = p_dec->pf_vout_buffer_new( p_dec );
@@ -655 +663 @@
-
-            /* interpolate the next PTS */
+#if LIBAVCODEC_BUILD >= 4754
+            if( p_sys->p_context->time_base.den > 0 )
+            {
+                p_sys->i_pts += I64C(1000000) *
+                    (2 + p_sys->p_ff_pic->repeat_pict) *
+                    p_sys->p_context->time_base.num *
+                    p_block->i_rate / INPUT_RATE_DEFAULT /
+                    (2 * p_sys->p_context->time_base.den);
+            }
+#else
-            if( p_sys->p_context->frame_rate > 0 )
-            {
@@ -663 +681 @@
-                    (2 * p_sys->p_context->frame_rate);
-            }
+#endif
-
-            if( p_sys->b_first_frame )

modules/stream_out/switcher.c

@@ -741 +741 @@
-                   i_aspect_den * (int64_t)id->ff_enc_c->width, 1 << 30 );
-
+#if LIBAVCODEC_BUILD >= 4754
+        id->ff_enc_c->time_base.num = 1;
+        id->ff_enc_c->time_base.den = 25; /* FIXME */
+#else
-        id->ff_enc_c->frame_rate    = 25; /* FIXME */
-        id->ff_enc_c->frame_rate_base = 1;
+#endif
-
-        id->ff_enc_c->gop_size = 200;