[MPlayer-cvslog] r19218 - trunk/libmpdemux/demux_avs.c

[reimar]

Author: reimar
Date: Fri Jul 28 17:04:10 2006
New Revision: 19218

Modified:
   trunk/libmpdemux/demux_avs.c

Log:
Move more stuff under if (avs_has_video... to simplify later patches.


Modified: trunk/libmpdemux/demux_avs.c
==============================================================================
--- trunk/libmpdemux/demux_avs.c	(original)
+++ trunk/libmpdemux/demux_avs.c	Fri Jul 28 17:04:10 2006
@@ -174,6 +174,8 @@
     demux_stream_t *d_video=demuxer->video;
     sh_video_t *sh_video=d_video->sh;
 
+    if (avs_has_video(AVS->video_info))
+    {
     if (AVS->video_info->num_frames < AVS->frameno) return 0; // EOF
     
     curr_frame = AVS->avs_get_frame(AVS->clip, AVS->frameno);
@@ -183,8 +185,6 @@
         return 0;
     }
 
-    if (avs_has_video(AVS->video_info))
-    {
         dp = new_demux_packet(curr_frame->vfb->data_size);
         sh_video->num_frames_decoded++;
         sh_video->num_frames++;
@@ -194,6 +194,8 @@
         memcpy(dp->buffer, curr_frame->vfb->data + curr_frame->offset, curr_frame->vfb->data_size);
         ds_add_packet(demuxer->video, dp);
 
+    AVS->frameno++;
+    AVS->avs_release_video_frame(curr_frame);
     }
     
 #ifdef ENABLE_AUDIO
@@ -214,8 +216,6 @@
     }
 #endif
     
-    AVS->frameno++;
-    AVS->avs_release_video_frame(curr_frame);
     return 1;
 }