diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-28 15:04:10 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-28 15:04:10 +0000 |
| commit | a367201b8ef5baaf6d6cbd114dded6a57e4411e8 (patch) | |
| tree | 46ab562235399ad39721e06c10a8401d31d73e4b /libmpdemux/demux_avs.c | |
| parent | 048f1a624482f5adb4a2ef49ca804f317b790f4b (diff) | |
| download | mpv-a367201b8ef5baaf6d6cbd114dded6a57e4411e8.tar.bz2 mpv-a367201b8ef5baaf6d6cbd114dded6a57e4411e8.tar.xz | |
Move more stuff under if (avs_has_video... to simplify later patches.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19218 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_avs.c')
| -rw-r--r-- | libmpdemux/demux_avs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpdemux/demux_avs.c b/libmpdemux/demux_avs.c index 2564dc6fdf..feca2b7f2a 100644 --- a/libmpdemux/demux_avs.c +++ b/libmpdemux/demux_avs.c @@ -174,6 +174,8 @@ static int demux_avs_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) 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 @@ static int demux_avs_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) 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 @@ static int demux_avs_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) 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 @@ static int demux_avs_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) } #endif - AVS->frameno++; - AVS->avs_release_video_frame(curr_frame); return 1; } |