Changeset 075cf0a0ab0dd962ad551efcbe6933aec601baac

Timestamp:

31/05/05 17:19:33 (4 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

Christophe Massiot <massiot@videolan.org> 1117552773 +0000

git-parent:

[44481f3118d87cf757a14ec9455201d01d35a791]

git-author:

Christophe Massiot <massiot@videolan.org> 1117552773 +0000

Message:

• modules/stream_out/switcher.c: Explicitly set the pixel format (this is
  due to a recent change of the default value in ffmpeg which used to be
  YUV 420P). Forward i_rate in case a transcode or display operation
  takes place after switcher.
  

Files:

• modules/stream_out/switcher.c (modified) (3 diffs)

modules/stream_out/switcher.c

@@ -757 +757 @@
-
-        id->ff_enc_c->mb_decision = FF_MB_DECISION_SIMPLE;
+        id->ff_enc_c->pix_fmt = PIX_FMT_YUV420P;
-
-        if( avcodec_open( id->ff_enc_c, id->ff_enc ) )
@@ -878 +879 @@
-    p_out->i_pts = p_buffer->i_dts;
-    p_out->i_dts = p_buffer->i_dts;
+    p_out->i_rate = p_buffer->i_rate;
-
-    switch ( id->ff_enc_c->coded_frame->pict_type )
@@ -920 +922 @@
-    p_out->i_pts = p_buffer->i_dts;
-    p_out->i_dts = p_buffer->i_dts;
+    p_out->i_rate = p_buffer->i_rate;
-
-    block_Release( p_buffer );