[vlc-commits] Support opening of wtv files
vlc | branch: master | Jean-Baptiste Kempf | Mon Oct 1 13:24:38 2012 +0200| [d12d32c772ddf0c8ac3362b97e82da6aac26927e] | committer: Jean-Baptiste Kempf Support opening of wtv files > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d12d32c772ddf0c8ac3362b97e82da6aac26927e --- include/vlc_interface.h |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/vlc_interface.h b/include/vlc_interface.h index a5d397b..b5d155c 100644 --- a/include/vlc_interface.h +++ b/include/vlc_interface.h @@ -192,7 +192,7 @@ typedef enum vlc_dialog { "mp2", "mp4", "mpeg", "mpeg1", \ "mpeg2", "mpeg4", "mpg", "mts", "mtv", "mxf", "mxg", "nuv", \ "ogg", "ogm", "ogv", "ogx", "ps", \ - "rec", "rm", "rmvb", "ts", "vob", "wm", "wmv", "xesc" + "rec", "rm", "rmvb", "ts", "vob", "wm", "wmv", "wtv", "xesc" #define EXTENSIONS_AUDIO \ "*.3ga;" \ @@ -249,7 +249,7 @@ typedef enum vlc_dialog { "*.m2t;*.m2ts;*.m4v;*.mkv;*.mov;*.mp2;*.mp2v;*.mp4;*.mp4v;*.mpa;*.mpe;*.mpeg;*.mpeg1;" \ "*.mpeg2;*.mpeg4;*.mpg;*.mpv2;*.mts;*.mtv;*.mxf;*.mxg;*.nsv;*.nuv;" \ "*.ogg;*.ogm;*.ogv;*.ogx;*.ps;" \ - "*.rec;*.rm;*.rmvb;*.tod;*.ts;*.tts;*.vob;*.vro;*.webm;*.wm;*.wmv;*.xesc" + "*.rec;*.rm;*.rmvb;*.tod;*.ts;*.tts;*.vob;*.vro;*.webm;*.wm;*.wmv;*.wtv;*.xesc" #define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.cue;*.ifo;*.m3u;*.m3u8;*.pls;*.ram;*.rar;*.sdp;*.vlc;*.xspf;*.wvx;*.zip;*.conf" ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Remove tabs in source code
vlc | branch: master | Jean-Baptiste Kempf | Mon Oct 1 13:48:47 2012 +0200| [198ef1527dcf30750ae8307575c755e313962849] | committer: Jean-Baptiste Kempf Remove tabs in source code > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=198ef1527dcf30750ae8307575c755e313962849 --- modules/arm_neon/chroma_neon.h |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/arm_neon/chroma_neon.h b/modules/arm_neon/chroma_neon.h index e0debae..f6ef1bf 100644 --- a/modules/arm_neon/chroma_neon.h +++ b/modules/arm_neon/chroma_neon.h @@ -26,15 +26,15 @@ * inferred from the color subsampling ratio. */ struct yuv_planes { - void *y, *u, *v; - size_t pitch; +void *y, *u, *v; +size_t pitch; }; /* Packed picture buffer. Pitch is in bytes (_not_ pixels). */ struct yuv_pack { - void *yuv; - size_t pitch; +void *yuv; +size_t pitch; }; /* I420 to YUYV conversion. */ ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Support opening of wtv files on the Mac
vlc | branch: master | Felix Paul Kühne | Mon Oct 1 14:09:27 2012 +0200| [517050c8b0f524e2b034680db861f69cc1a74a0b] | committer: Felix Paul Kühne Support opening of wtv files on the Mac > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=517050c8b0f524e2b034680db861f69cc1a74a0b --- extras/package/macosx/Info.plist.in | 12 1 file changed, 12 insertions(+) diff --git a/extras/package/macosx/Info.plist.in b/extras/package/macosx/Info.plist.in index f48dd00..404a86b 100644 --- a/extras/package/macosx/Info.plist.in +++ b/extras/package/macosx/Info.plist.in @@ -768,6 +768,18 @@ CFBundleTypeExtensions + wtv + + CFBundleTypeIconFile + generic.icns + CFBundleTypeName + Windows Recorded TV Show + CFBundleTypeRole + Viewer + + + CFBundleTypeExtensions + mpg mpeg mpeg1 ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Support opening .xesc files on the Mac
vlc | branch: master | Felix Paul Kühne | Mon Oct 1 14:13:33 2012 +0200| [07461c634cc3a373f8e45b57ee3bbe2299a9a534] | committer: Felix Paul Kühne Support opening .xesc files on the Mac > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=07461c634cc3a373f8e45b57ee3bbe2299a9a534 --- extras/package/macosx/Info.plist.in | 12 1 file changed, 12 insertions(+) diff --git a/extras/package/macosx/Info.plist.in b/extras/package/macosx/Info.plist.in index 404a86b..2261cbd 100644 --- a/extras/package/macosx/Info.plist.in +++ b/extras/package/macosx/Info.plist.in @@ -72,6 +72,18 @@ CFBundleTypeExtensions + xesc + + CFBundleTypeIconFile + movie.icns + CFBundleTypeName + Expression Encoder Screen Capture File + CFBundleTypeRole + Viewer + + + CFBundleTypeExtensions + pls CFBundleTypeIconFile ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: show more suitable icons instead of 'generic' for a couple of file extensions
vlc | branch: master | Felix Paul Kühne | Mon Oct 1 14:16:18 2012 +0200| [c9d65d2297fd415e4d31ec8a88781dd688684ecd] | committer: Felix Paul Kühne macosx: show more suitable icons instead of 'generic' for a couple of file extensions This affects: .opus, .ogx, .wtv, .rec, .vro, .tod and .mks > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c9d65d2297fd415e4d31ec8a88781dd688684ecd --- extras/package/macosx/Info.plist.in | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/extras/package/macosx/Info.plist.in b/extras/package/macosx/Info.plist.in index 2261cbd..9ed08df 100644 --- a/extras/package/macosx/Info.plist.in +++ b/extras/package/macosx/Info.plist.in @@ -483,7 +483,7 @@ opus CFBundleTypeIconFile - generic.icns + ogg.icns CFBundleTypeMIMETypes audio/opus @@ -560,7 +560,7 @@ ogx CFBundleTypeIconFile - generic.icns + ogg.icns CFBundleTypeMIMETypes application/ogg @@ -783,7 +783,7 @@ wtv CFBundleTypeIconFile - generic.icns + movie.icns CFBundleTypeName Windows Recorded TV Show CFBundleTypeRole @@ -1037,7 +1037,7 @@ rec CFBundleTypeIconFile - generic.icns + movie.icns CFBundleTypeName Topfield PVR Recording CFBundleTypeRole @@ -1073,7 +1073,7 @@ vro CFBundleTypeIconFile - generic.icns + movie.icns CFBundleTypeName DVD Video Recording Format CFBundleTypeRole @@ -1085,7 +1085,7 @@ tod CFBundleTypeIconFile - generic.icns + movie.icns CFBundleTypeName JVC Everio Video Capture File CFBundleTypeRole @@ -1097,7 +1097,7 @@ mks CFBundleTypeIconFile - generic.icns + mkv.icns CFBundleTypeName Matroska Elementry Stream CFBundleTypeRole ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Fix SSE4.2 detection
vlc | branch: master | Jean-Baptiste Kempf | Mon Oct 1 14:22:41 2012 +0200| [2a5976f991ab677c857062a9c6211937dcc8a5d5] | committer: Jean-Baptiste Kempf Fix SSE4.2 detection > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2a5976f991ab677c857062a9c6211937dcc8a5d5 --- src/posix/linux_cpu.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/posix/linux_cpu.c b/src/posix/linux_cpu.c index 9c71a6c..1ef2539 100644 --- a/src/posix/linux_cpu.c +++ b/src/posix/linux_cpu.c @@ -87,7 +87,7 @@ static void vlc_CPU_init (void) if (!strcmp (cap, "sse4_1")) core_caps |= VLC_CPU_SSE4_1; if (!strcmp (cap, "sse4_2")) -core_caps |= VLC_CPU_SSE4_1; +core_caps |= VLC_CPU_SSE4_2; if (!strcmp (cap, "sse4a")) core_caps |= VLC_CPU_SSE4A; if (!strcmp (cap, "avx")) ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Avcodec: fix typo for SSSE3
vlc | branch: master | Jean-Baptiste Kempf | Mon Oct 1 15:39:53 2012 +0200| [08a51ba6b0ac6e7e4c7de2431df669dd3f42ceb0] | committer: Jean-Baptiste Kempf Avcodec: fix typo for SSSE3 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=08a51ba6b0ac6e7e4c7de2431df669dd3f42ceb0 --- modules/codec/avcodec/cpu.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/codec/avcodec/cpu.c b/modules/codec/avcodec/cpu.c index 97d795f..9035a59 100644 --- a/modules/codec/avcodec/cpu.c +++ b/modules/codec/avcodec/cpu.c @@ -52,7 +52,7 @@ unsigned GetVlcDspMask( void ) mask |= AV_CPU_FLAG_SSE3; # endif # ifdef AV_CPU_FLAG_SSSE3 -if( !vlc_CPU_SSE3() ) +if( !vlc_CPU_SSSE3() ) mask |= AV_CPU_FLAG_SSSE3; # endif # ifdef AV_CPU_FLAG_SSE4 ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Avcodec: set the dsp_mask for NEON too
vlc | branch: master | Jean-Baptiste Kempf | Mon Oct 1 16:11:43 2012 +0200| [3d7a65c1ba5e79044c71c2b134c5a201ec83b5f2] | committer: Jean-Baptiste Kempf Avcodec: set the dsp_mask for NEON too > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3d7a65c1ba5e79044c71c2b134c5a201ec83b5f2 --- modules/codec/avcodec/cpu.c |5 + 1 file changed, 5 insertions(+) diff --git a/modules/codec/avcodec/cpu.c b/modules/codec/avcodec/cpu.c index 9035a59..91dd898 100644 --- a/modules/codec/avcodec/cpu.c +++ b/modules/codec/avcodec/cpu.c @@ -82,5 +82,10 @@ unsigned GetVlcDspMask( void ) mask |= AV_CPU_FLAG_ALTIVEC; #endif +#if defined ( __arm__) +if( !vlc_CPU_ARM_NEON() ) +mask |= AV_CPU_FLAG_NEON; +#endif + return mask; } ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] update: do not modify base64 input to add \0 terminators
vlc | branch: master | Rafaël Carré | Mon Oct 1 16:16:45 2012 +0200| [6841a105dad5bf416fe7e1b906bf4abdce21fbe9] | committer: Rafaël Carré update: do not modify base64 input to add \0 terminators It is not needed anymore since ce6521381b , parsing will stop at first unrecognized character (like \r or \n) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6841a105dad5bf416fe7e1b906bf4abdce21fbe9 --- src/misc/update_crypto.c |3 --- 1 file changed, 3 deletions(-) diff --git a/src/misc/update_crypto.c b/src/misc/update_crypto.c index 550bdc8..b7d5094 100644 --- a/src/misc/update_crypto.c +++ b/src/misc/update_crypto.c @@ -392,10 +392,7 @@ static int pgp_unarmor( char *p_ibuf, size_t i_ibuf_len, if( p_ipos[i_line_len - 1] == '=' ) { i_end = 1; -p_ipos[i_line_len - 1] = '\0'; } -else -p_ipos[i_line_len] = '\0'; p_opos += vlc_b64_decode_binary_to_buffer( p_opos, p_obuf - p_opos + i_obuf_len, p_ipos ); ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] update: constify
vlc | branch: master | Rafaël Carré | Mon Oct 1 16:18:35 2012 +0200| [32bfb8dc02f755d46761268f5674eb56671c81f5] | committer: Rafaël Carré update: constify > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=32bfb8dc02f755d46761268f5674eb56671c81f5 --- src/misc/update_crypto.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/misc/update_crypto.c b/src/misc/update_crypto.c index b7d5094..8e60fb0 100644 --- a/src/misc/update_crypto.c +++ b/src/misc/update_crypto.c @@ -55,7 +55,7 @@ #define packet_header_len( c ) ( ( c & 0x03 ) + 1 ) /* number of bytes in a packet header */ -static inline int scalar_number( uint8_t *p, int header_len ) +static inline int scalar_number( const uint8_t *p, int header_len ) { assert( header_len == 1 || header_len == 2 || header_len == 4 ); @@ -88,8 +88,8 @@ static inline int scalar_number( uint8_t *p, int header_len ) * fill a public_key_packet_t structure from public key packet data * verify that it is a version 4 public key packet, using DSA */ -static int parse_public_key_packet( public_key_packet_t *p_key, uint8_t *p_buf, -size_t i_packet_len ) +static int parse_public_key_packet( public_key_packet_t *p_key, +const uint8_t *p_buf, size_t i_packet_len ) { if( i_packet_len > 418 || i_packet_len < 6 ) @@ -124,7 +124,7 @@ error: static size_t parse_signature_v3_packet( signature_packet_t *p_sig, - uint8_t *p_buf, size_t i_sig_len ) + const uint8_t *p_buf, size_t i_sig_len ) { size_t i_read = 1; /* we already read the version byte */ @@ -161,7 +161,7 @@ static size_t parse_signature_v3_packet( signature_packet_t *p_sig, * verify that it was used with a DSA public key, using SHA-1 digest */ static size_t parse_signature_v4_packet( signature_packet_t *p_sig, - uint8_t *p_buf, size_t i_sig_len ) + const uint8_t *p_buf, size_t i_sig_len ) { size_t i_read = 1; /* we already read the version byte */ @@ -257,7 +257,7 @@ static size_t parse_signature_v4_packet( signature_packet_t *p_sig, static int parse_signature_packet( signature_packet_t *p_sig, - uint8_t *p_buf, size_t i_packet_len ) + const uint8_t *p_buf, size_t i_packet_len ) { if( !i_packet_len ) /* 1st sanity check, we need at least the version */ return VLC_EGENERIC; @@ -354,10 +354,10 @@ static long crc_octets( uint8_t *octets, size_t len ) * Transform an armored document in binary format * Used on public keys and signatures */ -static int pgp_unarmor( char *p_ibuf, size_t i_ibuf_len, +static int pgp_unarmor( const char *p_ibuf, size_t i_ibuf_len, uint8_t *p_obuf, size_t i_obuf_len ) { -char *p_ipos = p_ibuf; +const char *p_ipos = p_ibuf; uint8_t *p_opos = p_obuf; int i_end = 0; int i_header_skipped = 0; @@ -485,8 +485,8 @@ problem: int parse_public_key( const uint8_t *p_key_data, size_t i_key_len, public_key_t *p_key, const uint8_t *p_sig_issuer ) { -uint8_t *pos = (uint8_t*) p_key_data; -uint8_t *max_pos = pos + i_key_len; +const uint8_t *pos = p_key_data; +const uint8_t *max_pos = pos + i_key_len; int i_status = 0; #define PUBLIC_KEY_FOUND0x01 ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Win32: use CoInitializeEx() instead of CoInitialize()
vlc | branch: master | Rémi Denis-Courmont | Mon Oct 1 18:30:36 2012 +0300| [9b58a46173cbea1dc564cced3cfe208979849209] | committer: Rémi Denis-Courmont Win32: use CoInitializeEx() instead of CoInitialize() That is recommended by MSDN. Also, do not use 0 for NULL. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9b58a46173cbea1dc564cced3cfe208979849209 --- modules/access/dshow/dshow.cpp|2 +- modules/access/dtv/bdagraph.cpp |4 +--- modules/codec/dmo/dmo.c |2 +- modules/gui/qt4/components/simple_preferences.cpp |2 +- modules/gui/qt4/main_interface_win32.cpp |2 +- modules/video_output/msw/common.c |2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp index 3efd39b..384230f 100644 --- a/modules/access/dshow/dshow.cpp +++ b/modules/access/dshow/dshow.cpp @@ -409,7 +409,7 @@ static int CommonOpen( vlc_object_t *p_this, access_sys_t *p_sys, bool b_use_video = true; /* Initialize OLE/COM */ -CoInitialize( 0 ); +CoInitializeEx( NULL, COINIT_APARTMENTTHREADED ); var_Create( p_this, CFG_PREFIX "config", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_Create( p_this, CFG_PREFIX "tuner", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); diff --git a/modules/access/dtv/bdagraph.cpp b/modules/access/dtv/bdagraph.cpp index 608a3f8..48661c7 100644 --- a/modules/access/dtv/bdagraph.cpp +++ b/modules/access/dtv/bdagraph.cpp @@ -369,9 +369,7 @@ BDAGraph::BDAGraph( vlc_object_t *p_this ): p_scanning_tuner = NULL; p_grabber = NULL; -/* Initialize COM - MS says to use CoInitializeEx in preference to - * CoInitialize */ -CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); +CoInitializeEx( NULL, COINIT_APARTMENTTHREADED ); } /* diff --git a/modules/codec/dmo/dmo.c b/modules/codec/dmo/dmo.c index 4f5f3fc..ed62556 100644 --- a/modules/codec/dmo/dmo.c +++ b/modules/codec/dmo/dmo.c @@ -379,7 +379,7 @@ static int DecOpen( decoder_t *p_dec ) ldt_fs_t *ldt_fs = Setup_LDT_Keeper(); #else /* Initialize OLE/COM */ -CoInitialize( 0 ); +CoInitializeEx( NULL, COINIT_APARTMENTTHREADED ); #endif /* LOADER */ if( LoadDMO( VLC_OBJECT(p_dec), &hmsdmo_dll, &p_dmo, &p_dec->fmt_in, false ) diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index e69fc58..c19b30a 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -935,7 +935,7 @@ bool SPrefsPanel::addType( const char * psz_ext, QTreeWidgetItem* current, void SPrefsPanel::assoDialog() { IApplicationAssociationRegistrationUI *p_appassoc; -CoInitialize( 0 ); +CoInitializeEx( NULL, COINIT_APARTMENTTHREADED ); if( S_OK == CoCreateInstance(CLSID_ApplicationAssociationRegistrationUI, NULL, CLSCTX_INPROC_SERVER, diff --git a/modules/gui/qt4/main_interface_win32.cpp b/modules/gui/qt4/main_interface_win32.cpp index e9f9752..5623cdd 100644 --- a/modules/gui/qt4/main_interface_win32.cpp +++ b/modules/gui/qt4/main_interface_win32.cpp @@ -79,7 +79,7 @@ void MainInterface::createTaskBarButtons() FIXME:the play button's picture doesn't changed to pause when clicked */ -CoInitialize( 0 ); +CoInitializeEx( NULL, COINIT_APARTMENTTHREADED ); if( S_OK == CoCreateInstance( CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, diff --git a/modules/video_output/msw/common.c b/modules/video_output/msw/common.c index bc8e96f..1272455 100644 --- a/modules/video_output/msw/common.c +++ b/modules/video_output/msw/common.c @@ -274,7 +274,7 @@ static void CommonChangeThumbnailClip(vout_display_t *vd, bool show) if (!GetVersionEx(&winVer) || winVer.dwMajorVersion <= 5) return; -CoInitialize(0); +CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); void *ptr; if (S_OK == CoCreateInstance(&CLSID_TaskbarList, ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] dca: set output buffer size correctly (fixes #6509, fixes #7459)
vlc | branch: master | Rémi Denis-Courmont | Mon Oct 1 22:04:20 2012 +0300| [244a35b0301164f753a381f569181c6bd3419ad1] | committer: Rémi Denis-Courmont dca: set output buffer size correctly (fixes #6509, fixes #7459) Some filters and outputs rely on the samples count (which was correct), others on the bytes size (which was not), accounting for why decoding failed only in some combinations. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=244a35b0301164f753a381f569181c6bd3419ad1 --- modules/audio_filter/converter/dtstofloat32.c |1 + 1 file changed, 1 insertion(+) diff --git a/modules/audio_filter/converter/dtstofloat32.c b/modules/audio_filter/converter/dtstofloat32.c index 9d7b70d..c459a3a 100644 --- a/modules/audio_filter/converter/dtstofloat32.c +++ b/modules/audio_filter/converter/dtstofloat32.c @@ -314,6 +314,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_in_buf ) } } +p_out_buf->i_buffer = p_in_buf->i_nb_samples * 4 * p_sys->i_nb_channels; p_out_buf->i_nb_samples = p_in_buf->i_nb_samples; p_out_buf->i_dts = p_in_buf->i_dts; p_out_buf->i_pts = p_in_buf->i_pts; ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] dca: set output buffer size correctly (fixes #6509, fixes #7459)
vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont | Mon Oct 1 22:04:20 2012 +0300| [0358f72c22dc24a052dce857bf39bd07316f807a] | committer: Rémi Denis-Courmont dca: set output buffer size correctly (fixes #6509, fixes #7459) Some filters and outputs rely on the samples count (which was correct), others on the bytes size (which was not), accounting for why decoding failed only in some combinations. (cherry picked from commit 244a35b0301164f753a381f569181c6bd3419ad1) > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=0358f72c22dc24a052dce857bf39bd07316f807a --- modules/audio_filter/converter/dtstofloat32.c |1 + 1 file changed, 1 insertion(+) diff --git a/modules/audio_filter/converter/dtstofloat32.c b/modules/audio_filter/converter/dtstofloat32.c index 9f3fd02..84a900c 100644 --- a/modules/audio_filter/converter/dtstofloat32.c +++ b/modules/audio_filter/converter/dtstofloat32.c @@ -315,6 +315,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_in_buf ) } } +p_out_buf->i_buffer = p_in_buf->i_nb_samples * 4 * p_sys->i_nb_channels; p_out_buf->i_nb_samples = p_in_buf->i_nb_samples; p_out_buf->i_dts = p_in_buf->i_dts; p_out_buf->i_pts = p_in_buf->i_pts; ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] dca: set output buffer size correctly (fixes #6509, fixes #7459)
vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont | Mon Oct 1 22:04:20 2012 +0300| [661652c85488e4fa3cde507d13b24b08c1e0ff75] | committer: Rémi Denis-Courmont dca: set output buffer size correctly (fixes #6509, fixes #7459) Some filters and outputs rely on the samples count (which was correct), others on the bytes size (which was not), accounting for why decoding failed only in some combinations. (cherry picked from commit 244a35b0301164f753a381f569181c6bd3419ad1) > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=661652c85488e4fa3cde507d13b24b08c1e0ff75 --- modules/audio_filter/converter/dtstofloat32.c |1 + 1 file changed, 1 insertion(+) diff --git a/modules/audio_filter/converter/dtstofloat32.c b/modules/audio_filter/converter/dtstofloat32.c index 3812a87..9f1d383 100644 --- a/modules/audio_filter/converter/dtstofloat32.c +++ b/modules/audio_filter/converter/dtstofloat32.c @@ -314,6 +314,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_in_buf ) } } +p_out_buf->i_buffer = p_in_buf->i_nb_samples * 4 * p_sys->i_nb_channels; p_out_buf->i_nb_samples = p_in_buf->i_nb_samples; p_out_buf->i_dts = p_in_buf->i_dts; p_out_buf->i_pts = p_in_buf->i_pts; ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] vout_macosx: add additional sanity checks to prevent rare crashes
vlc | branch: master | Felix Paul Kühne | Mon Oct 1 23:26:48 2012 +0200| [48fcb08c1afd28d0aec079e964805254364d8dd8] | committer: Felix Paul Kühne vout_macosx: add additional sanity checks to prevent rare crashes > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=48fcb08c1afd28d0aec079e964805254364d8dd8 --- modules/video_output/macosx.m |3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m index dc71dfa..8d31402 100644 --- a/modules/video_output/macosx.m +++ b/modules/video_output/macosx.m @@ -423,6 +423,9 @@ static int Control (vout_display_t *vd, int query, va_list ap) static int OpenglLock (vlc_gl_t *gl) { vout_display_sys_t *sys = (vout_display_sys_t *)gl->sys; +if (!sys->glView || ![sys->glView respondsToSelector:@selector(openGLContext)]) +return 1; + NSOpenGLContext *context = [sys->glView openGLContext]; CGLError err = CGLLockContext ([context CGLContextObj]); if (kCGLNoError == err) { ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: fixed crash due to race condition on launch
vlc | branch: master | Felix Paul Kühne | Mon Oct 1 23:38:37 2012 +0200| [8ef447a49d49598e5b022c4b2f03a3b8a6a24d98] | committer: Felix Paul Kühne macosx: fixed crash due to race condition on launch The main window may be asked to update its content prior to VLCFSPanel being fully initialized > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8ef447a49d49598e5b022c4b2f03a3b8a6a24d98 --- modules/gui/macosx/MainWindow.m |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m index 98fc6ff..d9986f0 100644 --- a/modules/gui/macosx/MainWindow.m +++ b/modules/gui/macosx/MainWindow.m @@ -698,7 +698,8 @@ static VLCMainWindow *_o_sharedInstance = nil; } [self updateTimeSlider]; -[o_fspanel setSeekable: b_seekable]; +if ([o_fspanel respondsToSelector:@selector(setSeekable:)]) +[o_fspanel setSeekable: b_seekable]; PL_LOCK; if ([[[VLCMain sharedInstance] playlist] currentPlaylistRoot] != p_playlist->p_local_category || p_playlist->p_local_category->i_children > 0) ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits