diff -Nru vlc-2.2.2+git20170601+r59025+56~ubuntu16.04.1/debian/changelog vlc-2.2.2+git20170613+r59027+56~ubuntu16.04.1/debian/changelog --- vlc-2.2.2+git20170601+r59025+56~ubuntu16.04.1/debian/changelog 2017-06-01 17:51:54.000000000 +0000 +++ vlc-2.2.2+git20170613+r59027+56~ubuntu16.04.1/debian/changelog 2017-06-13 07:49:25.000000000 +0000 @@ -1,8 +1,8 @@ -vlc (2.2.2+git20170601+r59025+56~ubuntu16.04.1) xenial; urgency=low +vlc (2.2.2+git20170613+r59027+56~ubuntu16.04.1) xenial; urgency=low * Auto build. - -- Launchpad Package Builder Thu, 01 Jun 2017 17:51:54 +0000 + -- Launchpad Package Builder Tue, 13 Jun 2017 07:49:25 +0000 vlc (2.2.2-5) unstable; urgency=medium diff -Nru vlc-2.2.2+git20170601+r59025+56~ubuntu16.04.1/debian/git-build-recipe.manifest vlc-2.2.2+git20170613+r59027+56~ubuntu16.04.1/debian/git-build-recipe.manifest --- vlc-2.2.2+git20170601+r59025+56~ubuntu16.04.1/debian/git-build-recipe.manifest 2017-06-01 17:51:54.000000000 +0000 +++ vlc-2.2.2+git20170613+r59027+56~ubuntu16.04.1/debian/git-build-recipe.manifest 2017-06-13 07:49:25.000000000 +0000 @@ -1,3 +1,3 @@ -# git-build-recipe format 0.4 deb-version {debupstream}+git20170601+r59025+56 -lp:~videolan/vlc/+git/vlc-2.2 git-commit:36e8122e68a45f66b9dfe5fbea924be0ca291afa +# git-build-recipe format 0.4 deb-version {debupstream}+git20170613+r59027+56 +lp:~videolan/vlc/+git/vlc-2.2 git-commit:994dd92d68c447d7a5519077ceef74865a552ba6 merge packaging lp:~videolan/vlc/+git/packaging git-commit:344abb46cb450ef04aaba9a08235573e133b487e diff -Nru vlc-2.2.2+git20170601+r59025+56~ubuntu16.04.1/modules/codec/avcodec/video.c vlc-2.2.2+git20170613+r59027+56~ubuntu16.04.1/modules/codec/avcodec/video.c --- vlc-2.2.2+git20170601+r59025+56~ubuntu16.04.1/modules/codec/avcodec/video.c 2017-06-01 17:51:01.000000000 +0000 +++ vlc-2.2.2+git20170613+r59027+56~ubuntu16.04.1/modules/codec/avcodec/video.c 2017-06-13 07:49:15.000000000 +0000 @@ -2,7 +2,7 @@ * video.c: video decoder using the libavcodec library ***************************************************************************** * Copyright (C) 1999-2001 VLC authors and VideoLAN - * $Id: 971238612c9cb5f57edd0fa9d35af48070a250ec $ + * $Id: 1bcad21ad2a397b23280664ca44321cdaf7deaa5 $ * * Authors: Laurent Aimar * Gildas Bazin @@ -610,7 +610,7 @@ post_mt( p_sys ); av_init_packet( &pkt ); - if( p_block ) + if( p_block && p_block->i_buffer > 0 ) { pkt.data = p_block->p_buffer; pkt.size = p_block->i_buffer; diff -Nru vlc-2.2.2+git20170601+r59025+56~ubuntu16.04.1/modules/packetizer/h264.c vlc-2.2.2+git20170613+r59027+56~ubuntu16.04.1/modules/packetizer/h264.c --- vlc-2.2.2+git20170601+r59025+56~ubuntu16.04.1/modules/packetizer/h264.c 2017-06-01 17:51:01.000000000 +0000 +++ vlc-2.2.2+git20170613+r59027+56~ubuntu16.04.1/modules/packetizer/h264.c 2017-06-13 07:49:16.000000000 +0000 @@ -2,7 +2,7 @@ * h264.c: h264/avc video packetizer ***************************************************************************** * Copyright (C) 2001, 2002, 2006 VLC authors and VideoLAN - * $Id: 7e29b8683e0c3d1e07146b7b6952c0175d98b6d8 $ + * $Id: ded600fb94562651ac2518c270d0841de09e8f19 $ * * Authors: Laurent Aimar * Eric Petit @@ -142,8 +142,10 @@ NAL_SEI = 6, /* ref_idc == 0 */ NAL_SPS = 7, NAL_PPS = 8, - NAL_AU_DELIMITER= 9 + NAL_AU_DELIMITER= 9, /* ref_idc == 0 for 6,9,10,11,12 */ + NAL_END_OF_SEQ = 10, + NAL_END_OF_STREAM = 11, }; #define BLOCK_FLAG_PRIVATE_AUD (1 << BLOCK_FLAG_PRIVATE_SHIFT) @@ -661,6 +663,22 @@ /* Do not append the PPS because we will insert it on keyframes */ p_frag = NULL; } + else if( i_nal_type == NAL_END_OF_SEQ || i_nal_type == NAL_END_OF_STREAM ) + { + /* Force early output */ + if( p_frag ) + { + block_ChainAppend( &p_sys->p_frame, p_frag ); + p_frag = NULL; + } + + if( p_sys->b_slice ) + { + p_pic = OutputPicture( p_dec ); + if( p_pic ) /* set flag for menus / stills */ + p_pic->i_flags |= BLOCK_FLAG_END_OF_SEQUENCE; + } + } else if( i_nal_type == NAL_AU_DELIMITER || i_nal_type == NAL_SEI || ( i_nal_type >= 13 && i_nal_type <= 18 ) ) diff -Nru vlc-2.2.2+git20170601+r59025+56~ubuntu16.04.1/.pc/.quilt_patches vlc-2.2.2+git20170613+r59027+56~ubuntu16.04.1/.pc/.quilt_patches --- vlc-2.2.2+git20170601+r59025+56~ubuntu16.04.1/.pc/.quilt_patches 2017-06-01 17:51:55.000000000 +0000 +++ vlc-2.2.2+git20170613+r59027+56~ubuntu16.04.1/.pc/.quilt_patches 2017-06-13 07:49:29.000000000 +0000 @@ -1 +1 @@ -/home/buildd/build-RECIPEBRANCHBUILD-1382961/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches +/home/buildd/build-RECIPEBRANCHBUILD-1390645/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches diff -Nru vlc-2.2.2+git20170601+r59025+56~ubuntu16.04.1/.pc/.quilt_series vlc-2.2.2+git20170613+r59027+56~ubuntu16.04.1/.pc/.quilt_series --- vlc-2.2.2+git20170601+r59025+56~ubuntu16.04.1/.pc/.quilt_series 2017-06-01 17:51:55.000000000 +0000 +++ vlc-2.2.2+git20170613+r59027+56~ubuntu16.04.1/.pc/.quilt_series 2017-06-13 07:49:29.000000000 +0000 @@ -1 +1 @@ -/home/buildd/build-RECIPEBRANCHBUILD-1382961/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches/series +/home/buildd/build-RECIPEBRANCHBUILD-1390645/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches/series