[vlc-commits] commit: OpenGL: use clz() ( R émi Denis-Courmont )
vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Sat Nov 13
18:47:44 2010 +0200| [b9a7045b5126535b46d4afb94329e5d38c260467] | committer:
Rémi Denis-Courmont
OpenGL: use clz()
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b9a7045b5126535b46d4afb94329e5d38c260467
---
modules/video_output/opengl.c | 11 ---
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index e7ea1ab..d66eaec 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -93,14 +93,11 @@
# define VLCGL_TYPE VLCGL_RGB_TYPE
#endif
-static inline int GetAlignedSize(int i_size)
+static inline int GetAlignedSize(unsigned size)
{
-/* Return the nearest power of 2 */
-int i_result = 1;
-while(i_result i_size)
-i_result *= 2;
-
-return i_result;
+/* Return the smallest larger or equal power of 2 */
+unsigned align = 1 (8 * sizeof (unsigned) - clz(size));
+return ((align 1) == size) ? size : align;
}
int vout_display_opengl_Init(vout_display_opengl_t *vgl,
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] commit: Qt4: try again to fix the quitting issue (Jean-Baptiste Kempf )
vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf j...@videolan.org | Sat
Nov 13 18:05:27 2010 +0100| [6f4519c7c804a8f0e204ace4d130554c5da18d36] |
committer: Jean-Baptiste Kempf
Qt4: try again to fix the quitting issue
This seems to work on XP, 7 (32+64) and Linux (32+64)
I know it is a hack, but so far, this is the only solution I have found.
http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=6f4519c7c804a8f0e204ace4d130554c5da18d36
---
modules/gui/qt4/components/interface_widgets.cpp |2 ++
modules/gui/qt4/main_interface.cpp | 11 +++
modules/gui/qt4/main_interface.hpp |1 +
modules/gui/qt4/qt4.cpp | 10 +++---
4 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/modules/gui/qt4/components/interface_widgets.cpp
b/modules/gui/qt4/components/interface_widgets.cpp
index c930277..c615ace 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -173,6 +173,8 @@ void VideoWidget::release( void )
{
msg_Dbg( p_intf, Video is not needed anymore );
+if(!stable)
+return;
assert( stable );
layout-removeWidget( stable );
stable-deleteLater();
diff --git a/modules/gui/qt4/main_interface.cpp
b/modules/gui/qt4/main_interface.cpp
index 5893d19..1bd3e63 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -223,6 +223,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) :
QVLCMW( _p_intf )
CONNECT( THEDP, toolBarConfUpdated(), this, recreateToolbars() );
+CONNECT( this, askToQuit(), THEDP, quit() );
/** END of CONNECTS**/
@@ -263,6 +264,7 @@ MainInterface::~MainInterface()
if( stackCentralOldWidget == videoWidget )
showTab( bgWidget );
+releaseVideoSlot();
#ifdef WIN32
if( himl )
ImageList_Destroy( himl );
@@ -584,7 +586,8 @@ void MainInterface::releaseVideo( void )
/* Function that is CONNECTED to the previous emit */
void MainInterface::releaseVideoSlot( void )
{
-videoWidget-release();
+if( videoWidget )
+videoWidget-release();
setVideoOnTop( false );
setVideoFullScreen( false );
@@ -1130,9 +1133,9 @@ void MainInterface::wheelEvent( QWheelEvent *e )
void MainInterface::closeEvent( QCloseEvent *e )
{
-e-accept();
-hide();
-THEDP-quit();
+//hide();
+e-ignore();
+emit askToQuit();
}
void MainInterface::setInterfaceFullScreen( bool fs )
diff --git a/modules/gui/qt4/main_interface.hpp
b/modules/gui/qt4/main_interface.hpp
index e2a5985..4f4d208 100644
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -235,6 +235,7 @@ signals:
void askVideoOnTop( bool );
void minimalViewToggled( bool );
void fullscreenInterfaceToggled( bool );
+void askToQuit();
};
diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 0213ad7..5ed7682 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -365,8 +365,14 @@ static void Close( vlc_object_t *p_this )
if( !p_sys-b_isDialogProvider )
var_Destroy (pl_Get(p_this), qt4-iface);
+/* And quit */
+msg_Dbg( p_intf, Please die, die, die... );
+QApplication::closeAllWindows();
+
+//QApplication::quit();
QVLCApp::triggerQuit();
+msg_Dbg( p_intf, Please die, die, die 2... );
vlc_join (p_sys-thread, NULL);
#ifdef Q_WS_X11
free (x11_display);
@@ -469,9 +475,7 @@ static void *Thread( void *obj )
/* Launch */
app.exec();
-/* And quit */
-QApplication::closeAllWindows();
-
+msg_Dbg( p_intf, Exec finished() );
if (p_mi != NULL)
{
#warning BUG!
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] commit: On the road to 1.1.6 (Jean-Baptiste Kempf )
vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf j...@videolan.org | Sat Nov 13 19:39:58 2010 +0100| [264eb6d145507c0e6f152ce86cd26441bc4156d6] | committer: Jean-Baptiste Kempf On the road to 1.1.6 http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=264eb6d145507c0e6f152ce86cd26441bc4156d6 --- NEWS |8 +++- configure.ac |6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 72ea2ee..ea7740b 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,13 @@ +Changes between 1.1.5 and 1.1.6-git: +- + + + Changes between 1.1.4.1 and 1.1.5: -- Security: - * Fix a Windows crash on accessing Network Shared files/drives, + * Fix a Windows crash on accessing Network Shared files/drives, VideoLAN-SA-1006 Access: @@ -45,6 +50,7 @@ Translations: * Major update and activation on Windows of Modern Greek * New Asturian translation + Changes between 1.1.4 and 1.1.4.1: -- diff --git a/configure.ac b/configure.ac index 0ce7a88..d4f6121 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,11 @@ dnl Autoconf settings for vlc AC_COPYRIGHT([Copyright 2002-2010 the VideoLAN team]) -AC_INIT(vlc, 1.1.5) +AC_INIT(vlc, 1.1.6-git) VERSION_MAJOR=1 VERSION_MINOR=1 -VERSION_REVISION=5 -VERSION_EXTRA= +VERSION_REVISION=6 +VERSION_EXTRA=-git PKGDIR=vlc AC_SUBST(PKGDIR) ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] commit: Return fatal error to the upper layers when connection is lost while reading the ICY metadata . Otherwise we will end up with an endless loop since -1 is interpreted by AStreamRe
vlc | branch: master | Sven Petai had...@bsd.ee | Sat Nov 6 11:32:59 2010
+0200| [2a3e95d7b511fb627ac79a626068f4ba4271ad13] | committer: Rémi
Denis-Courmont
Return fatal error to the upper layers when connection is lost while reading
the ICY metadata. Otherwise we will end up with an endless loop since -1 is
interpreted by AStreamRefillStream() as a temporary error.
Signed-off-by: Rémi Denis-Courmont r...@remlab.net
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2a3e95d7b511fb627ac79a626068f4ba4271ad13
---
modules/access/http.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules/access/http.c b/modules/access/http.c
index e4ea721..5519af9 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -826,7 +826,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer,
size_t i_len )
if( ReadICYMeta( p_access ) )
{
p_access-info.b_eof = true;
-return -1;
+return 0;
}
}
if( i_len i_next )
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] commit: Make returning fatal error from the Read() more obvious. No functional change. (Sven Petai )
vlc | branch: master | Sven Petai had...@bsd.ee | Sat Nov 6 12:25:01 2010
+0200| [ec1566fe68ee6b2e027b379671c75dae21c1bb52] | committer: Rémi
Denis-Courmont
Make returning fatal error from the Read() more obvious. No functional change.
Signed-off-by: Rémi Denis-Courmont r...@remlab.net
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ec1566fe68ee6b2e027b379671c75dae21c1bb52
---
modules/access/http.c | 30 ++
1 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/modules/access/http.c b/modules/access/http.c
index 5519af9..b1890d1 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -760,10 +760,7 @@ static ssize_t Read( access_t *p_access, uint8_t
*p_buffer, size_t i_len )
int i_read;
if( p_sys-fd == -1 )
-{
-p_access-info.b_eof = true;
-return 0;
-}
+goto fatal;
if( p_sys-b_has_size )
{
@@ -780,10 +777,7 @@ static ssize_t Read( access_t *p_access, uint8_t
*p_buffer, size_t i_len )
if( p_sys-b_chunked )
{
if( p_sys-i_chunk 0 )
-{
-p_access-info.b_eof = true;
-return 0;
-}
+goto fatal;
if( p_sys-i_chunk = 0 )
{
@@ -801,8 +795,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer,
size_t i_len )
if( p_sys-i_chunk = 0 ) /* eof */
{
p_sys-i_chunk = -1;
-p_access-info.b_eof = true;
-return 0;
+goto fatal;
}
}
@@ -811,10 +804,7 @@ static ssize_t Read( access_t *p_access, uint8_t
*p_buffer, size_t i_len )
}
if( i_len == 0 )
-{
-p_access-info.b_eof = true;
-return 0;
-}
+goto fatal;
if( p_sys-i_icy_meta 0 p_access-info.i_pos-p_sys-i_icy_offset 0 )
{
@@ -824,10 +814,7 @@ static ssize_t Read( access_t *p_access, uint8_t
*p_buffer, size_t i_len )
if( i_next == p_sys-i_icy_meta )
{
if( ReadICYMeta( p_access ) )
-{
-p_access-info.b_eof = true;
-return 0;
-}
+goto fatal;
}
if( i_len i_next )
i_len = i_next;
@@ -883,10 +870,9 @@ static ssize_t Read( access_t *p_access, uint8_t
*p_buffer, size_t i_len )
if( i_read = 0 )
{
-p_access-info.b_eof = true;
if( i_read 0 )
p_sys-b_error = true;
-return 0;
+goto fatal;
}
}
@@ -900,6 +886,10 @@ static ssize_t Read( access_t *p_access, uint8_t
*p_buffer, size_t i_len )
}
return i_read;
+
+fatal:
+p_access-info.b_eof = true;
+return 0;
}
static int ReadICYMeta( access_t *p_access )
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] commit: qt4: Get rid of towlower in f avor of portability ( Juho Vähä-Herttua )
vlc | branch: master | Juho Vähä-Herttua juh...@iki.fi | Fri Nov 12 15:26:00
2010 +0200| [fb48e363450c0a56d1688a510528a246ae7c36a1] | committer: Rémi
Denis-Courmont
qt4: Get rid of towlower in favor of portability
Signed-off-by: Rémi Denis-Courmont r...@remlab.net
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fb48e363450c0a56d1688a510528a246ae7c36a1
---
modules/gui/qt4/util/customwidgets.cpp | 13 +++--
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/modules/gui/qt4/util/customwidgets.cpp
b/modules/gui/qt4/util/customwidgets.cpp
index de5c877..1a0abbb 100644
--- a/modules/gui/qt4/util/customwidgets.cpp
+++ b/modules/gui/qt4/util/customwidgets.cpp
@@ -424,12 +424,13 @@ int qtEventToVLCKey( QKeyEvent *e )
uint32_t i_vlck = 0;
if( qtk = 0xff )
-/* VLC and X11 use lowercase whereas Qt uses uppercase */
-#if defined( __STDC_ISO_10646__ ) || defined( _WIN32 ) || defined( __APPLE__ )
-i_vlck = towlower( qtk );
-#else
-# error FIXME
-#endif
+{
+/* VLC and X11 use lowercase whereas Qt uses uppercase, this
+ * method should be equal to towlower in case of latin1 */
+if( qtk = 'A' qtk = 'Z' ) i_vlck = qtk+32;
+else if( qtk = 0xC0 qtk = 0xDE qtk != 0xD7) i_vlck = qtk+32;
+else i_vlck = qtk;
+}
else
{
const vlc_qt_key_t *map;
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] commit: Update the release howto to actually match what we are doing ( Jean-Baptiste Kempf )
vlc | branch: master | Jean-Baptiste Kempf j...@videolan.org | Sat Nov 13 20:33:06 2010 +0100| [83b0e6f2e20271e2b6c691a887b21bad5869f4d9] | committer: Jean-Baptiste Kempf Update the release howto to actually match what we are doing http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=83b0e6f2e20271e2b6c691a887b21bad5869f4d9 --- doc/release-howto.txt | 79 +--- 1 files changed, 28 insertions(+), 51 deletions(-) diff --git a/doc/release-howto.txt b/doc/release-howto.txt index a0c7953..186bdb4 100644 --- a/doc/release-howto.txt +++ b/doc/release-howto.txt @@ -6,26 +6,26 @@ * Tests: compilation, regression tests ... * Changes on the git repository - - update the version number everywhere it's needed + - Check that the version number everywhere it's needed · configure.ac - - update the NEWS files, as well as the Trac database. - read all the commits and add important things to the NEWS file - - update the milestones info on https://trac.videolan.org/vlc - - Add a note about the matching contrib package in INSTALL.win32 + · NEWS + - Update important things and add them to the NEWS file + - Close the milestone on Trac https://trac.videolan.org/vlc - Update OpenGPG key embedded in include/vlc_update.h if needed - Increase the libvlccore and libvlc revisions in src/Makefile.am _if_and_only_if_ the ABI number has not been increased instead, in which case the revision goes back to zero. * Commit + * Tag the commit * Tarballs (Use a clean tree !!!) - - Use 'make distcheck' to make sure all files are exported -correctly - - copy the tar.xz file on ftp.videolan.org in -/opt/ftp/pub/videolan/testing/vlc-X.X.X/ + - Use 'make distcheck' to make sure all files are exported correctly + - copy the tar.xz file on altair.videolan.org + - copy the binaries files on altair.videolan.org, if possible - generate SHA, MD5 hashes and OpenPGP signature of these files (use sha*sum --binary, md5sum --binary, gpg --sign --detach --armor) +Use the ~/bin/sumandsign.sh script * Contribs - Put a copy of the libraries or git snapshot in vlc-X.X.X/contrib @@ -33,56 +33,40 @@ - Update developers.v.o/vlc and www.v.o/vlc/download-sources.html * Win32 Packages -make the packages using the nightly builds configure/options/... , don't - forget --enable-update-check -don't forget to test the installer and uninstaller (the first 0.8.4 -uninstaller was broken ... kind of suxxs) -add the .zip and .exe files to /opt/ftp/pub/videolan/testing/vlc-X.X.X/win32/ -generate md5 plus SHA1 hashes and gpg signature of these files + - configure using the extras/package/win32/configure-mingw-release.sh script + - move to altair and generate md5 plus SHA1 hashes and gpg signature of these files (c.f. Tarballs) * OS X packages -Information on compilation: wiki.videolan.org/OSXCompile -configure with --enable-update-check -compile the source on both a PowerPC and an Intel-based Mac. Don't try to + - configure using ./configure --enable-macosx + - compile the source on both a PowerPC and an Intel-based Mac. Don't try to cross-compile for either platform. Don't forget the framework. -use extras/package/macosx/ub.sh to create a Universal Binary. Test it on - PowerPC and Intel-based Macs. -add the .dmg files to /opt/ftp/pub/videolan/testing/vlc-X.X.X/macosx/ -Nomenclature is vlc-X.X.X-$(PLATFORM).dmg respectively - vlc-plugin-X.X.X-$(PLATFORM).dmg and vlckit-X.X.X-$(PLATFORM).dmg. -Don't put any platform for the UB package. -generate md5 plus SHA1 hashes and gpg signature of these files - (c.f. gpg --sign --detach --armor) + - use extras/package/macosx/ub.sh to create a Universal Binary. + - move to altair and generate md5 plus SHA1 hashes and gpg signature of these files +(c.f. Tarballs) * Commit changes ... it never works the first time * Tag the release - git tag -a -m VLC Release VERSION VERSION (Create an annotated tag, you can skip -a if you used -m) git push origin VERSION -(You are advised to play with it on the sandrox.git if you feel - uncomfortable) - - * Move /opt/ftp/pub/videolan/testing/vlc-X.X.X to - /opt/ftp/pub/videolan/vlc/X.X.X - - At first block access to this directory by http or ftp. Only authorize - rsync. - This is to avoid leak as some journalists and forums seem to watch the ftp. - - Update the latest symlink + * Move the signed files from altair to ganesh, on /opt/ftp/pub/videolan/vlc/X.X.X + - At first block access to this directory by http or ftp. Only authorize rsync. +This is to avoid leak as some journalists and forums seem to watch the ftp. + - Update the last symlink * Update the website - - edit the /index.php /vlc/*.php pages + - edit the /index.php /vlc/*.php, include/os-specific.php files + - create a
[vlc-commits] Tag 1.1.5 : Jean-Baptiste Kempf : VLC 1.1.5 - 'The Luggage'
[vlc/vlc-1.1] [branch: refs/tags/1.1.5] Tag:15716e8d78b71dd9afe334faa9234e51a3790a83 http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git?a=tag;h=15716e8d78b71dd9afe334faa9234e51a3790a83 Tagger: Jean-Baptiste Kempf j...@videolan.org Date: Sat Nov 13 18:22:50 2010 +0100 VLC 1.1.5 - 'The Luggage' This is the sixth release of the 1.1.x branch of VLC. This is a minor release, focused on minor features, bugfixes and security issues: - VideoLAN-SA-1006 security issue on Windows - Game Music Emu support rewritten and activated - Integration of a new list of webshows from channels.com - Fixes on h264 playback hardware decoding using Intel GPU on Windows - Fixes on .webm live streams, and DVD - Multiple fixes in interfaces, scripts, demuxers and video outputs - Addition of libvlc_media_new_fd() - Translations ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] commit: OpenCV: do not assume picture is at p_data_orig ( Rémi Denis-Courmont )
vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Sat Nov 13
23:55:27 2010 +0200| [48cecf7cdc0443255ea15375865faa1c45d4214e] | committer:
Rémi Denis-Courmont
OpenCV: do not assume picture is at p_data_orig
This seems quite wrong to me, but untested.
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=48cecf7cdc0443255ea15375865faa1c45d4214e
---
modules/video_filter/opencv_example.c | 10 +-
modules/video_filter/opencv_wrapper.c |1 -
2 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/modules/video_filter/opencv_example.c
b/modules/video_filter/opencv_example.c
index 5e84b74..b32cdcd 100644
--- a/modules/video_filter/opencv_example.c
+++ b/modules/video_filter/opencv_example.c
@@ -139,9 +139,6 @@ static void CloseFilter( vlc_object_t *p_this )
/
* Filter: Check for faces and raises an event when one is found.
-
- * p_pic: A picture_t with its p_data_orig member set to an array of
- * IplImages (one image for each picture_t plane).
/
static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
{
@@ -156,13 +153,8 @@ static picture_t *Filter( filter_t *p_filter, picture_t
*p_pic )
msg_Err( p_filter, no image array );
return NULL;
}
-if (!(p_pic-p_data_orig))
-{
-msg_Err( p_filter, no image array );
-return NULL;
-}
//(hack) cast the picture_t to array of IplImage*
-p_img = (IplImage**) p_pic-p_data_orig;
+p_img = (IplImage**) p_pic-p[0].p_pixels;
i_planes = p_pic-i_planes;
//check the image array for validity
diff --git a/modules/video_filter/opencv_wrapper.c
b/modules/video_filter/opencv_wrapper.c
index 721eec3..a2e45ae 100644
--- a/modules/video_filter/opencv_wrapper.c
+++ b/modules/video_filter/opencv_wrapper.c
@@ -509,7 +509,6 @@ static void VlcPictureToIplImage( vout_thread_t *p_vout,
picture_t *p_in )
//Hack the above opencv image array into a picture_t so that it can be
sent to
//another video filter
-p_sys-hacked_pic.p_data_orig = p_sys-p_cv_image;
p_sys-hacked_pic.i_planes = planes;
p_sys-hacked_pic.format.i_chroma = fmt_out.i_chroma;
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] commit: OSD: remove always NULL p_f eedback button field ( Rémi Denis-Courmont )
vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Sat Nov 13
23:40:24 2010 +0200| [a69d057ffdfa6477287e0ccaf544eb50557827ad] | committer:
Rémi Denis-Courmont
OSD: remove always NULL p_feedback button field
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a69d057ffdfa6477287e0ccaf544eb50557827ad
---
include/vlc_osd.h |1 -
modules/misc/osd/osd_menu.c | 20
2 files changed, 0 insertions(+), 21 deletions(-)
diff --git a/include/vlc_osd.h b/include/vlc_osd.h
index 06168b4..02b394e 100644
--- a/include/vlc_osd.h
+++ b/include/vlc_osd.h
@@ -170,7 +170,6 @@ struct osd_button_t
osd_state_t *p_current_state; /* pointer to current state image */
osd_state_t *p_states; /* doubly linked list of states */
-picture_t *p_feedback; /* feedback picture */
char*psz_name; /* name of button */
diff --git a/modules/misc/osd/osd_menu.c b/modules/misc/osd/osd_menu.c
index 57cd24e..a26e7c1 100644
--- a/modules/misc/osd/osd_menu.c
+++ b/modules/misc/osd/osd_menu.c
@@ -92,7 +92,6 @@ osd_button_t *osd_ButtonNew( const char *psz_action, int i_x,
int i_y )
p_button-psz_action = strdup(psz_action);
p_button-psz_action_down = NULL;
-p_button-p_feedback = NULL;
p_button-i_x = i_x;
p_button-i_y = i_y;
@@ -128,12 +127,6 @@ void osd_ButtonFree( osd_menu_t *p_menu, osd_button_t
*p_button )
free( p_current-p_next-psz_name );
free( p_current-p_next-psz_action );
free( p_current-p_next-psz_action_down );
-if( p_current-p_feedback )
-{
-free( p_current-p_feedback-p_data_orig );
-free( p_current-p_feedback );
-p_current-p_feedback = NULL;
-}
/* Free all states first */
if( p_current-p_next-p_states )
@@ -148,13 +141,6 @@ void osd_ButtonFree( osd_menu_t *p_menu, osd_button_t
*p_button )
free( p_current-p_up-psz_name );
free( p_current-p_up-psz_action );
free( p_current-p_up-psz_action_down );
-if( p_current-p_feedback )
-{
-free( p_current-p_feedback-p_data_orig );
-free( p_current-p_feedback );
-}
-
-p_current-p_feedback = NULL;
/* Free all states first */
if( p_current-p_up-p_states )
@@ -171,12 +157,6 @@ void osd_ButtonFree( osd_menu_t *p_menu, osd_button_t
*p_button )
free( p_button-psz_name );
free( p_button-psz_action );
free( p_button-psz_action_down );
-if( p_current-p_feedback )
-{
-free( p_current-p_feedback-p_data_orig );
-free( p_current-p_feedback );
-p_current-p_feedback = NULL;
-}
if( p_button-p_states )
osd_StatesFree( p_menu, p_button-p_states );
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] commit: rtp input: vorbis payload format is now an RFC (Pierre Ynard )
vlc | branch: master | Pierre Ynard linkfa...@yahoo.fr | Sat Nov 13 23:48:23
2010 +0100| [d1a8c96a9f08ac62facc360398d6bf3a33d2eeff] | committer: Pierre
Ynard
rtp input: vorbis payload format is now an RFC
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d1a8c96a9f08ac62facc360398d6bf3a33d2eeff
---
modules/access/rtp/xiph.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules/access/rtp/xiph.c b/modules/access/rtp/xiph.c
index c99280a..ecae060 100644
--- a/modules/access/rtp/xiph.c
+++ b/modules/access/rtp/xiph.c
@@ -40,7 +40,7 @@
#include rtp.h
/* PT=dynamic
- * vorbis: Xiph Vorbis audio (draft-ietf-avt-rtp-vorbis-09, RFC FIXME)
+ * vorbis: Xiph Vorbis audio (RFC 5215)
*/
typedef struct rtp_vorbis_t
{
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] commit: rtp: use VLC_TS_INVALID (Pierre Ynard )
vlc | branch: master | Pierre Ynard linkfa...@yahoo.fr | Sun Nov 14 05:11:12
2010 +0100| [349f269051e7d7c5a20b8db61b0fb9f7e4b20151] | committer: Pierre
Ynard
rtp: use VLC_TS_INVALID
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=349f269051e7d7c5a20b8db61b0fb9f7e4b20151
---
modules/access/rtp/rtp.c |2 +-
modules/access/rtp/session.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/access/rtp/rtp.c b/modules/access/rtp/rtp.c
index 55e8dd7..3cf48eb 100644
--- a/modules/access/rtp/rtp.c
+++ b/modules/access/rtp/rtp.c
@@ -423,7 +423,7 @@ static void codec_decode (demux_t *demux, void *data,
block_t *block)
{
if (data)
{
-block-i_dts = 0; /* RTP does not specify this */
+block-i_dts = VLC_TS_INVALID; /* RTP does not specify this */
es_out_Control (demux-out, ES_OUT_SET_PCR, block-i_pts );
es_out_Send (demux-out, (es_out_id_t *)data, block);
}
diff --git a/modules/access/rtp/session.c b/modules/access/rtp/session.c
index a9df4f1..7fb52dc 100644
--- a/modules/access/rtp/session.c
+++ b/modules/access/rtp/session.c
@@ -168,7 +168,7 @@ rtp_source_create (demux_t *demux, const rtp_session_t
*session,
source-ssrc = ssrc;
source-jitter = 0;
source-ref_rtp = 0;
-/* TODO: use 0, but VLC does not like negative PTS at the moment */
+/* TODO: use VLC_TS_0, but VLC does not like negative PTS at the moment */
source-ref_ntp = UINT64_C (1) 62;
source-max_seq = source-bad_seq = init_seq;
source-last_seq = init_seq - 1;
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
