summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-11 23:15:57 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-11 23:15:57 +0000
commita30246e1935ffe5c4e22f660ae346f62ced06b21 (patch)
treef8688b847dcaf5326d99573806ff7410eb0f58f3 /libmpdemux
parent7875c2e15021e10a5b3ab116d315c723c8344be8 (diff)
downloadmpv-a30246e1935ffe5c4e22f660ae346f62ced06b21.tar.bz2
mpv-a30246e1935ffe5c4e22f660ae346f62ced06b21.tar.xz
check pce_ptr before using it; fixes cid 207
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17815 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/muxer_mpeg.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c
index 6bc0b53a22..f8d21921c6 100644
--- a/libmpdemux/muxer_mpeg.c
+++ b/libmpdemux/muxer_mpeg.c
@@ -1794,6 +1794,9 @@ static int soft_telecine(muxer_headers_t *vpriv, uint8_t *fps_ptr, uint8_t *se_p
uint8_t fps, tff, rff;
int period;
+ if(! pce_ptr)
+ return 0;
+
period = (vpriv->telecine == TELECINE_FILM2PAL) ? 12 : 4;
if(fps_ptr != NULL)
{
@@ -1829,8 +1832,6 @@ static int soft_telecine(muxer_headers_t *vpriv, uint8_t *fps_ptr, uint8_t *se_p
if(se_ptr)
se_ptr[1] &= 0xf7;
- if(! pce_ptr)
- return 0;
if(! vpriv->vframes) //initial value of tff
vpriv->trf = (pce_ptr[3] >> 6) & 0x2;