diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-11-02 19:01:13 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-11-02 19:01:13 +0000 |
| commit | 3d584f9b18b2595aa8617f20fa9804625369a12f (patch) | |
| tree | 73858c2b138b97bf552ab74b0658f1a3636adebe /libmpdemux | |
| parent | ddd4c2e6d034e9a9693912e86e2a407ae9080a45 (diff) | |
| download | mpv-3d584f9b18b2595aa8617f20fa9804625369a12f.tar.bz2 mpv-3d584f9b18b2595aa8617f20fa9804625369a12f.tar.xz | |
moved to fix_parameters() the decision of the necessity of the PSM based on the format of the video stream
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24935 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/muxer_mpeg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index 7132c5f168..0b4a4c9c68 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -2272,6 +2272,9 @@ static void fix_parameters(muxer_stream_t *stream) spriv->is_ready = 0; else spriv->is_ready = 1; + + if(!is_mpeg1(stream_format) && !is_mpeg2(stream_format)) + priv->use_psm = 1; } if(priv->is_genmpeg2) @@ -2323,8 +2326,6 @@ static void mpegfile_write_chunk(muxer_stream_t *s,size_t len,unsigned int flags { spriv->is_mpeg12 = 0; spriv->telecine = 0; - if(spriv->size == 0) - priv->use_psm = 1; if(len) sz = parse_mpeg4_video(s, priv, spriv, fps, len); else |