Changeset acbd501ea8663f6d7a1a3ecd90f7b4e7bceed16b

Timestamp:

22/02/04 00:50:52 (5 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

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

git-parent:

[b6fde88ed9664916983ea43fc5f3d7ee76a96748]

git-author:

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

Message:

* modules/stream_out/transcode.c: fixed memleak. Set aspect ratio info even for raw video input.

Files:

• modules/stream_out/transcode.c (modified) (5 diffs)

modules/stream_out/transcode.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2003-2004 VideoLAN
-8 2004/02/20 19:21:25 massiot
+9 2004/02/21 23:50:52 gbazin
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -1042 +1042 @@
-        id->ff_dec_c->height    = id->f_src.video.i_height;
-        id->ff_dec_c->pix_fmt   = get_ff_chroma( id->f_src.i_codec );
+
+#if LIBAVCODEC_BUILD >= 4687
+        if( id->ff_dec_c->width )
+        id->ff_dec_c->sample_aspect_ratio =
+            av_d2q( id->f_src.video.i_aspect / (double)VOUT_ASPECT_FACTOR *
+                    id->ff_dec_c->height / id->ff_dec_c->width, 255 );
+#else
+        id->ff_dec_c->aspect_ratio =
+            id->f_src.video.i_aspect / (float)VOUT_ASPECT_FACTOR;
+#endif
-    }
-    else
@@ -1278 +1288 @@
-        int i_plane;
-
-        p_pic = malloc(sizeof(picture_t));
-
-        /* decode frame */
-        frame = id->p_ff_pic;
@@ -1520 +1528 @@
-
-        /* Encoding */
+        p_pic = malloc(sizeof(picture_t));
-        vout_InitPicture( VLC_OBJECT(p_stream), p_pic,
-                          id->p_encoder->fmt_in.i_codec,
@@ -1531 +1540 @@
-            if ( p_sys->i_threads >= 1 )
-            {
-
-
+
+
+
+
+
-            }
-            else