Revert the DVD LPCM header description changes; will be added back later.

[vlc] / modules / demux / avformat / mux.c

diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index 00c2277fdc8b7df80c06d2c67c77bf6522a6a3fa..af69662b8ad735407ef986819f16df197e2c904e 100644 (file)
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -151,11 +151,7 @@ int OpenMux( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0)
     p_sys->oc->pb = &p_sys->io;
-#else
-    p_sys->oc->pb = p_sys->io;
-#endif
     p_sys->oc->nb_streams = 0;
 
     p_sys->b_write_header = true;
@@ -238,6 +234,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
         codec->channels = p_input->p_fmt->audio.i_channels;
         codec->sample_rate = p_input->p_fmt->audio.i_rate;
         codec->time_base = (AVRational){1, codec->sample_rate};
+        codec->frame_size = p_input->p_fmt->audio.i_frame_length;
         break;
 
     case VIDEO_ES: