[vlc-commits] Revert "packetizer: mpegvideo: don't output slice on sequence extension"

Francois Cartegnie git at videolan.org
Tue Apr 17 14:32:45 CEST 2018


vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Apr 12 10:33:16 2018 +0200| [0ee8a915160471ca62e2b0cf1e06e2db412c2f49] | committer: Francois Cartegnie

Revert "packetizer: mpegvideo: don't output slice on sequence extension"

This reverts commit 0efc936bca3381c4e2405d3652f0c56fb661bb68.

(cherry picked from commit 844c30c9b4c3ba9ba415941a1d801f340a55aa53)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=0ee8a915160471ca62e2b0cf1e06e2db412c2f49
---

 modules/packetizer/mpegvideo.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/packetizer/mpegvideo.c b/modules/packetizer/mpegvideo.c
index 703b1d78e1..3214922761 100644
--- a/modules/packetizer/mpegvideo.c
+++ b/modules/packetizer/mpegvideo.c
@@ -438,8 +438,7 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag )
 
     }
     else if( p_sys->b_frame_slice &&
-             (startcode == PICTURE_STARTCODE ||
-             (startcode >  SLICE_STARTCODE_LAST && startcode != EXTENSION_STARTCODE )) )
+             (startcode == PICTURE_STARTCODE || startcode >  SLICE_STARTCODE_LAST) )
     {
         const bool b_eos = startcode == SEQUENCE_END_STARTCODE;
 



More information about the vlc-commits mailing list