[FFmpeg-soc] [soc]: r1406 - in libavfilter/diffs: 01_ffplay_get_video_frame.diff 03_ffplay_filters.diff

[Bobby Bingham]

On Tue, 16 Oct 2007 21:18:15 +0200 (CEST)
vitor <subversion at mplayerhq.hu> wrote:

> Author: vitor
> Date: Tue Oct 16 21:18:14 2007
> New Revision: 1406
> 
> Log:
> Fix crash after video end.
> As a positive secondary effect, I think the new patch #01 will be
> easier to get in the trunk.
> 
> Please flame me if I'm doing anything wrong.

[...]

> Modified: libavfilter/diffs/01_ffplay_get_video_frame.diff
> ==============================================================================
> --- libavfilter/diffs/01_ffplay_get_video_frame.diff	(original)
> +++ libavfilter/diffs/01_ffplay_get_video_frame.diff	Tue Oct
> 16 21:18:14 2007 @@ -2,7 +2,7 @@ Index: ffplay.c
>  ===================================================================
>  --- ffplay.c	(revision 10755)
>  +++ ffplay.c	(working copy)
> -@@ -1341,21 +1341,12 @@
> +@@ -1341,49 +1341,63 @@
>       avcodec_default_release_buffer(c, pic);
>   }
>   
> @@ -23,11 +23,15 @@ Index: ffplay.c
>  -        if (packet_queue_get(&is->videoq, pkt, 1) < 0)
>  -            break;
>  -
> -+    while (packet_queue_get(&is->videoq, pkt, 1) >= 0) {
> ++    if (packet_queue_get(&is->videoq, pkt, 1) < 0)
> ++        return -1;
> ++    

This change breaks video playback for me.  Changing it back to a while
loop, but keeping all the other changes seems to fix it for me, and
still fixes the hang at the end of playback.

-- 
Bobby Bingham
Never trust atoms.  Or anything made of atoms.
このメールは再利用されたバイトでできている。