Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
c299138f
Commit
c299138f
authored
Nov 27, 2003
by
Laurent Aimar
Browse files
* all: drop block(s) with b_discontinuity set.
parent
e5c71f3f
Changes
2
Hide whitespace changes
Inline
Side-by-side
modules/codec/ffmpeg/audio.c
View file @
c299138f
...
...
@@ -2,7 +2,7 @@
* audio.c: audio decoder using ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2003 VideoLAN
* $Id: audio.c,v 1.2
6
2003/11/2
4 00
:3
9
:0
1
fenrir Exp $
* $Id: audio.c,v 1.2
7
2003/11/2
7 12
:3
2
:0
3
fenrir Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
...
...
@@ -157,7 +157,7 @@ aout_buffer_t *E_( DecodeAudio )( decoder_t *p_dec, block_t **pp_block )
return
NULL
;
}
if
(
p_block
->
i_buffer
<=
0
)
if
(
p_block
->
i_buffer
<=
0
||
p_block
->
b_discontinuity
)
{
block_Release
(
p_block
);
return
NULL
;
...
...
modules/codec/ffmpeg/video.c
View file @
c299138f
...
...
@@ -2,7 +2,7 @@
* video.c: video decoder using the ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: video.c,v 1.5
3
2003/11/2
4 23:22:01 gbazin
Exp $
* $Id: video.c,v 1.5
4
2003/11/2
7 12:32:03 fenrir
Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
...
...
@@ -349,6 +349,15 @@ picture_t *E_(DecodeVideo)( decoder_t *p_dec, block_t **pp_block )
p_block
=
*
pp_block
;
if
(
p_block
->
b_discontinuity
)
{
p_sys
->
i_buffer
=
0
;
p_sys
->
i_pts
=
0
;
/* To make sure we recover properly */
block_Release
(
p_block
);
return
NULL
;
}
if
(
p_block
->
i_pts
>
0
||
p_block
->
i_dts
>
0
)
{
p_sys
->
input_pts
=
p_block
->
i_pts
;
...
...
@@ -392,7 +401,7 @@ picture_t *E_(DecodeVideo)( decoder_t *p_dec, block_t **pp_block )
block_Release
(
p_block
);
p_sys
->
i_pts
=
0
;
/* To make sure we recover properly */
p_sys
->
i_late_frames
--
;
return
VLC_SUCCESS
;
return
NULL
;
}
if
(
p_sys
->
p_context
->
width
<=
0
||
p_sys
->
p_context
->
height
<=
0
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment