Author: kwizart Update of /cvs/free/rpms/vlc/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24004/devel Modified Files: .cvsignore sources vlc.spec Added Files: vlc-2.0.1-fftype.patch Log Message: Update to 2.0.1 vlc-2.0.1-fftype.patch: switcher.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- NEW FILE vlc-2.0.1-fftype.patch --- diff -up vlc-2.0.1/modules/stream_out/switcher.c.orig vlc-2.0.1/modules/stream_out/switcher.c --- vlc-2.0.1/modules/stream_out/switcher.c.orig 2012-05-01 16:31:41.036832197 +0200 +++ vlc-2.0.1/modules/stream_out/switcher.c 2012-05-01 16:35:53.694838241 +0200 @@ -844,7 +844,7 @@ static block_t *VideoGetBuffer( sout_str if ( id->i_nb_pred >= p_sys->i_gop ) { - id->p_frame->pict_type = FF_I_TYPE; + id->p_frame->pict_type = AV_PICTURE_TYPE_I; #if 0 id->p_frame->me_threshold = 0; id->p_frame->mb_threshold = 0; @@ -853,7 +853,7 @@ static block_t *VideoGetBuffer( sout_str } else { - id->p_frame->pict_type = FF_P_TYPE; + id->p_frame->pict_type = AV_PICTURE_TYPE_P; #if 0 if ( id->p_frame->mb_type != NULL ) { @@ -873,7 +873,7 @@ static block_t *VideoGetBuffer( sout_str #if 0 if ( id->p_frame->mb_type == NULL - && id->ff_enc_c->coded_frame->pict_type != FF_I_TYPE ) + && id->ff_enc_c->coded_frame->pict_type != AV_PICTURE_TYPE_I ) { int mb_width = (id->ff_enc_c->width + 15) / 16; int mb_height = (id->ff_enc_c->height + 15) / 16; @@ -926,13 +926,13 @@ static block_t *VideoGetBuffer( sout_str switch ( id->ff_enc_c->coded_frame->pict_type ) { - case FF_I_TYPE: + case AV_PICTURE_TYPE_I: p_out->i_flags |= BLOCK_FLAG_TYPE_I; break; - case FF_P_TYPE: + case AV_PICTURE_TYPE_P: p_out->i_flags |= BLOCK_FLAG_TYPE_P; break; - case FF_B_TYPE: + case AV_PICTURE_TYPE_B: p_out->i_flags |= BLOCK_FLAG_TYPE_B; break; default: Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- .cvsignore 22 Feb 2012 22:57:22 -0000 1.46 +++ .cvsignore 2 May 2012 22:46:20 -0000 1.47 @@ -1 +1 @@ -vlc-2.0.0.tar.xz +vlc-2.0.1.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/vlc/devel/sources,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sources 22 Feb 2012 22:57:22 -0000 1.54 +++ sources 2 May 2012 22:46:20 -0000 1.55 @@ -1 +1 @@ -8806bff2ea9c76791123d444a92f708c vlc-2.0.0.tar.xz +5ad114755670e4881a2b35354e2f79bc vlc-2.0.1.tar.xz Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- vlc.spec 13 Mar 2012 08:44:19 -0000 1.150 +++ vlc.spec 2 May 2012 22:46:20 -0000 1.151 @@ -21,8 +21,8 @@ Summary: The cross-platform open-source multimedia framework, player and server Name: vlc -Version: 2.0.0 -Release: 5%{?dist} +Version: 2.0.1 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.videolan.org @@ -486,6 +486,9 @@ %changelog +* Wed May 02 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.0.1-1 +- Update to 2.0.1 + * Tue Mar 13 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.0.0-5 - Rebuilt for x264 ABI 0.120