Changeset f982997d88c3e7fbe8194df75cc8c63ecb985962

Show
Ignore:
Timestamp:
02/22/04 01:15:33 (5 years ago)
Author:
Gildas Bazin <gbazin@videolan.org>
git-committer:
Gildas Bazin <gbazin@videolan.org> 1077408933 +0000
git-parent:

[acbd501ea8663f6d7a1a3ecd90f7b4e7bceed16b]

git-author:
Gildas Bazin <gbazin@videolan.org> 1077408933 +0000
Message:

* ALL: preparation for 0.7.1-test2.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • ChangeLog

    r9dec8be rf982997  
     12004-02-21 Saturday 23:50  gbazin 
     2 
     3 * modules/stream_out/transcode.c: fixed memleak. Set aspect ratio info even for raw video input. 
     4 
     52004-02-21 Saturday 23:15  gbazin 
     6 
     7 * include/charset.h: added "extern "C" {" for c++ modules. 
     8 * modules/mux/mp4.c, modules/demux/ts.c: fixed memleaks. 
     9 
     102004-02-21 Saturday 22:41  gbazin 
     11 
     12 * modules/codec/ffmpeg/encoder.c: make it ffmpeg-0.4.8 friendly. 
     13 
     142004-02-20 Friday 22:07  gbazin 
     15 
     16 * configure.ac: what about checking for the c++ preprocessor. 
     17 
     182004-02-20 Friday 19:21  massiot 
     19 
     20 * modules/stream_out/transcode.c : don't lock when quitting. 
     21 
     222004-02-20 Friday 19:21  gbazin 
     23 
     24 * modules/demux/a52sys.c: forgot to remove this file. 
     25 * modules/audio_output/alsa.c: kind of a work-around for a strange bug that trashes the stack. Doesn't solve it but should be easier to track down now. 
     26 
     272004-02-20 Friday 19:03  massiot 
     28 
     29 * modules/stream_out/transcode.c: fixed a segfault when quitting. 
     30 
     312004-02-20 Friday 18:34  massiot 
     32 
     33 * modules/codec/ffmpeg/encoder.c, modules/stream_out/transcode.c : 
     34   - new ffmpeg options available from the command-line : interleaved video, 
     35     noise reduction, rate control parameters, i_quant_factor, trellis 
     36     quantification, mpeg4 matrix, and thread count 
     37   - portable functions to use ffmpeg multithreading capabilities on all 
     38     platforms 
     39   - hurry up mode now turns off rd and trellis, and also raises the noise 
     40     reduction parameter (thus noise reduction is mandatory with hurry up) 
     41   - if threads=1, no ffmpeg thread is launched, but the ffmpeg encoding 
     42     will be done in a separate thread than the packetizer and decoder 
     43   - fixed a bug with mp3 decoding and weird ffmpeg return code 
     44 
     452004-02-20 Friday 18:24  massiot 
     46 
     47 * modules/packetizer/mpegvideo.c: display the picture size and frame rate 
     48   exactly once. 
     49 
     502004-02-20 Friday 17:20  massiot 
     51 
     52 * src/misc/threads.c: made vlc_set_thread_priority usable on non-Darwin 
     53   OSes, and added an rt-offset configuration variable to tune the priority 
     54   of VLC against other programs without recompiling everything. 
     55 
     562004-02-20 Friday 17:16  massiot 
     57 
     58 * modules/demux/mpeg/system.c: check for scrambled packets. 
     59 
     602004-02-20 Friday 17:13  massiot 
     61 
     62 * modules/access_output/udp.c: do not send out packets which are too much 
     63   in the past, to avoid flooding the client. 
     64 
     652004-02-20 Friday 16:29  bigben 
     66 
     67 coding style 
     68 
     692004-02-20 Friday 15:38  bigben 
     70 
     71 cleaning of pvr input  : settings are only set if  given on command line 
     72 (no more default values). 
     73 
     74 Patch from Tim O Callaghan (tim.ocallaghan - AT - limestudios - DOT - com) 
     75 
     762004-02-19 Thursday 19:38  hartman 
     77 
     78 * Revert back to old prefs. 
     79   - fixed the bug with the modules not setting up their prefs. 
     80   - bugs: int with strings items are broken (see relfontsize) 
     81   - hotkeys elements don't really work 
     82 
     832004-02-19 Thursday 18:55  courmisch 
     84 
     85 Removed Vladimir Chernyshov's email address (kept his name). 
     86 
     872004-02-19 Thursday 17:42  jpsaman 
     88 
     89 Correct fix for iPAQ. (do not mix watching your kids and coding, it doesn't mix ;-)) 
     90 
     912004-02-19 Thursday 16:19  gbazin 
     92 
     93 * modules/codec/faad.c: compilation fix and proper 16bits pcm support. 
     94 
     952004-02-19 Thursday 15:42  jpsaman 
     96 
     97 Tell FAAD2 to produce FAAD_FMT_16BIT (16bits PCM values) and VLC so that it doesn't need to do a conversion filter for it. 
     98 
     992004-02-19 Thursday 15:13  jpsaman 
     100 
     101 Fix for iPAQ choose fixed point arithmic in FAAD decoder. 
     102 
     1032004-02-19 Thursday 02:05  rocky 
     104 
     105 Structure not big enough and was writing past buffer boundary. 
     106 Thanks to Marco Z�for finding this problem. 
     107 
     1082004-02-18 Wednesday 13:21  fenrir 
     109 
     110  * transcode: fixed s16b <-> s16l conversion. 
     111 
     1122004-02-17 Tuesday 13:13  gbazin 
     113 
     114 * ALL: portability fixes. 
     115 
     1162004-02-17 Tuesday 03:12  hartman 
     117 
     118 * vout_OSDMessage doxygen doc update 
     119 * fix broken vout_OSDMessage in other files 
     120 
     1212004-02-16 Monday 17:16  zorglub 
     122 
     123 Added an option "recursive" 
     124    - none: subdirectories are skipped 
     125    - collapse: former behaviour, subdirectories are not expanded 
     126    - expand: all subdirectories are fully expanded 
     127 
     128 I dislike these strings, please find other ones :) 
     129 
     1302004-02-16 Monday 17:14  zorglub 
     131 
     132 * Swap duration and group columns 
     133 * Introduce duration sort 
     134 
     1352004-02-16 Monday 17:14  zorglub 
     136 
     137 Fix setting the name and the author with DEMUX_GET_META 
     138 
     1392004-02-16 Monday 13:33  gbazin 
     140 
     141 * modules/access/dshow/filter.cpp: work-around a bug in w32api-2.5. 
     142 
     1432004-02-15 Sunday 22:20  gbazin 
     144 
     145 * modules/misc/network/ipv6.c: fix for ipv6 name resolution, courtesy of Jeroen Massar (jeroen at unfix dot org). 
     146 
     1472004-02-15 Sunday 21:52  gbazin 
     148 
     149 * modules/audio_filter/converter/dtstospdif.c: fixed the swab() replacement. 
     150 
     1512004-02-15 Sunday 19:40  sigmunau 
     152 
     153 modules/control/lirc/lirc.c: 
     154  * backported some changes from the hotkeys module 
     155  * implemented buttons to cycle audio and subtitle tracks. 
     156  * implemented a mute button 
     157 doc/lirc/example.lircrc: 
     158  * example for the new buttons 
     159 
     1602004-02-15 Sunday 18:58  ipkiss 
     161 
     162  * modules/gui/skins/*: 
     163     Added 'slow' and 'fast' events to play a stream slower/faster 
     164 
     1652004-02-15 Sunday 18:22  sigmunau 
     166 
     167 include/osd.h, src/video_output/video_text.c: 
     168  * turned vout_OSDMessage into __vout_OSDMessage 
     169  * __vout_OSDMessage now takes printf style parameters 
     170  * added a macro vout_OSDMessage that calls __vout_OSDMessage with the first 
     171    parameter passed through VLC_OBJECT() 
     172 
     1732004-02-15 Sunday 16:59  fenrir 
     174 
     175  * nsv: display sub stream and skip extention data (initial patch from 
     176  Vitalijus dot Slavinskas at stud dot ktu dot lt). 
     177 
     1782004-02-15 Sunday 13:16  gbazin 
     179 
     180 * modules/demux/ogg.c: fixed recent breakage (what a shameful bug). 
     181 
     1822004-02-14 Saturday 17:36  gbazin 
     183 
     184 * modules/access/cdda/*: forgot to remove demux in module declaration. 
     185    fixed deadlock with CDDAFixupPlayList(). 
     186 
     1872004-02-14 Saturday 17:25  gbazin 
     188 
     189 * modules/access/cdda*: removed definition of WAVEHEADER. 
     190 * modules/access/cdda.c: small bug fix. 
     191 
     1922004-02-14 Saturday 17:03  gbazin 
     193 
     194 * modules/demux/wav.c: started support for WAVEFORMATEXTENSIBLE (aka multichannel). 
     195    support for float32 format. 
     196 * include/codecs.h: added WAVEFORMATEXTENSIBLE structure. 
     197 * modules/codec/araw.c: fixes. 
     198 
     1992004-02-14 Saturday 12:49  gbazin 
     200 
     201 * modules/gui/skins2/events/evt_scroll.hpp: small portability fix. 
     202 
     2032004-02-14 Saturday 12:36  gbazin 
     204 
     205 * modules/gui/wxwindows/*: make gcc-2.95 happy. 
     206 
     2072004-02-14 Saturday 01:53  gbazin 
     208 
     209 * ALL: small portability fixes. 
     210 
     2112004-02-13 Friday 23:54  gbazin 
     212 
     213 * modules/demux/playlist/playlist.c: compilation fix. 
     214 
     2152004-02-13 Friday 22:37  gbazin 
     216 
     217 * modules/demux/a52.c: better detection code. 
     218 
     2192004-02-13 Friday 22:14  gbazin 
     220 
     221 * modules/demux/a52.c: grmbl. 
     222 
     2232004-02-13 Friday 22:10  gbazin 
     224 
     225 * modules/demux/a52.c: fixed alignment when seeking. 
     226 
     2272004-02-13 Friday 21:48  gbazin 
     228 
     229 * modules/demux/a52.c: rewritten from scratch to use the a52 packetizer and to handle a52 wav files and audio CD's. 
     230 * modules/codec/a52.c: a52 wav files and audio CD's use padding so don't always check for next sync code. 
     231 
     2322004-02-13 Friday 11:58  rocky 
     233 
     234 Better worded. 
     235 
     2362004-02-13 Friday 11:33  rocky 
     237 
     238 More checking: for programs and XML-related files.  If some programs 
     239 aren't around (e.g. lynx) don't build the corresponding piece that 
     240 needs that. 
     241 
     2422004-02-13 Friday 10:42  titer 
     243 
     244  deinterlace.c : missing 'else' that prevented MergeAltivec from being used. 
     245 
     2462004-02-13 Friday 10:09  jpsaman 
     247 
     248 Disabled the preference menu, it is not filled in anyway. 
     249 
     2502004-02-13 Friday 04:22  rocky 
     251 
     252 Do better about being able to build developer documentation on many 
     253 platforms.  This still sucks, but it sucks less. Hopefully I can shame 
     254 someone to go further. 
     255 
     2562004-02-13 Friday 00:57  rocky 
     257 
     258 Call for help. 
     259 
     2602004-02-12 Thursday 23:51  gbazin 
     261 
     262 * modules/stream_out/transcode.c: fixed color inversion when transcoding from raw RV24. 
     263 
     2642004-02-12 Thursday 20:09  fenrir 
     265 
     266  * all: use the data_packet_count from the asf header when the server 
     267 gives an invalid one. (I hope it doesn't break anything) 
     268 
     2692004-02-12 Thursday 17:52  fenrir 
     270 
     271  * v4l: patch from Carsten Gottbeh�ttbehuet at active-elements dot de) 
     272  -> Untested. 
     273 
     274  Original message: 
     275     Hi there, 
     276 
     277     I have done another small modification. If you remove a hot-pluggable video 
     278     device, like an usb web cam, during capturing, vlc floods the driver with 
     279     ioctls. This leads to Kernel Ooops in some drivers. 
     280 
     281     The modified v4l.c module does the following now: 
     282     "GrabVideo" returns "VLC_ETIMEOUT" if the question "Did we wait long enough" 
     283     can be answered with yes. If there is a real error in "GrabCapture" or 
     284     "GrabMJPEG", the code "VLC_EGENERIC" is returned. So the calling function 
     285     can distinguish between these two situations. "VLC_EGENERIC" was always 
     286     returned before. 
     287     The function "Read" uses this information to leave the while-loop in case of 
     288     an error, and it returns a "-1" to the calling function. "Read" calls 
     289     "msleep", as it was before, in case of a VLC_ETIMEOUT. 
     290 
     291     The brightness-control stuff described below is still in the code. Please 
     292     feel free to use, modify or ignore this file. A short feedback would be 
     293     nice. 
     294 
     295     Bye, 
     296 
     2972004-02-12 Thursday 17:35  titer 
     298 
     299  macosx/vout.m : GL cleaning (probably fixes depth issues) 
     300 
     3012004-02-11 Wednesday 19:17  fenrir 
     302 
     303  * all: added a "input-repeat" option that allow repeating the same entry 
     304  without destroying/recreating a new input. (Will be usefull for streaming). 
     305  ( A value of -1 means repeat for ever). 
     306  --> Not tested with dvd. 
     307 
     3082004-02-11 Wednesday 18:08  gbazin 
     309 
     310 * modules/access/cdda/*: got rid of the demux. The access plugin will now build a WAV header which will allow this plugin to work with the dts/a52 demuxers as well as the wav demuxer. 
     311 
     3122004-02-11 Wednesday 12:37  rocky 
     313 
     314 And one other piece of information... 
     315 
     3162004-02-11 Wednesday 12:26  rocky 
     317 
     318 Spell out general information that should be used in reporting 
     319 problems. Sigh. 
     320 
     3212004-02-11 Wednesday 12:23  rocky 
     322 
     323 Spell out general information that should be used in reporting 
     324 problems. Sigh. 
     325 
     3262004-02-11 Wednesday 08:50  zorglub 
     327 
     328 Enable the playlist import/export modules 
     329 
     3302004-02-11 Wednesday 08:22  jpsaman 
     331 
     332 Added some whitespace for alignment. 
     333 
     3342004-02-10 Tuesday 20:30  jpsaman 
     335 
     336 Enabled PDA GUI again, use --enable-pda. Question why was it disabled without notifying the maintainer? ???? 
     337 
     3382004-02-10 Tuesday 20:28  jpsaman 
     339 
     340 Missed the deadline again ;-( 
     341 
     342 - Fixed the playlist_AddExt() call 
     343 - Fixed a compiler warning 
     344 
     3452004-02-10 Tuesday 17:59  gbazin 
     346 
     347 * configure.ac: check for the xmlTextReader extension if libxml2 (required for skins2). 
     348 
     3492004-02-10 Tuesday 17:36  gbazin 
     350 
     351 * configure.ac, NEWS: added mod and pva plugins. 
     352 
     3532004-02-10 Tuesday 16:39  bigben 
     354 
     355 typos 
     356 
     3572004-02-10 Tuesday 14:57  jpsaman 
     358 
     359 Fixes for DVB-C: 
     360 - Make sure that lnb-lof1 and lnb-lof2 can be overriden by the commandline syntax frequency=xx:lnb-lof1=xx:lnb-lof2=xx 
     361 - Added value {A,a} to polarization=xx to force INVERSION_AUTO 
     362 - Sanatized a few error messages 
     363 
     3642004-02-10 Tuesday 14:33  sam 
     365 
     366   * debian/rules debian/control: 
     367     + No longer build a local libmpeg2 since it entered sid. 
     368     + Build the livedotcom plugin. 
     369   * toolbox: 
     370     + No longer remove flac, speex and matroska from the woody build; I will 
     371       provide clean backports. 
     372 
     3732004-02-10 Tuesday 14:04  sam 
     374 
     375   * configure.ac: 
     376     + Allow to use --enable-livedotcom without --with-livedotcom-tree so that 
     377       we can use an installed version of libliveMedia et al. 
     378 
     3792004-02-10 Tuesday 13:29  sam 
     380 
     381   * configure.ac: 
     382     + Only activate the Matroska plugin if -lebml_pic or -lebml were found. 
     383 
     3842004-02-10 Tuesday 02:57  hartman 
     385 
     386 * Fixed the ogm subs. Thanx to Mosu who pointed me to the fact that the 
     387   duration for subs is stored in byte1 of the data packet and who 
     388   directed me to the mkvtoolnix code. 
     389 
     3902004-02-09 Monday 23:30  garf 
     391 
     392  * http.c: made strsub a bit clean. 
     393 
     3942004-02-09 Monday 23:28  garf 
     395 
     396  * intf-http.txt: update doc (strsub) 
     397 
     3982004-02-09 Monday 23:03  garf 
     399 
     400  * http.c: add strsub function: extract substring (doc update will 
     401            follow soon). 
     402 
     4032004-02-09 Monday 20:40  sam 
     404 
     405   * debian/README.Debian: 
     406     + Updated Debian-specific build notes. 
     407 
     4082004-02-09 Monday 19:32  jpsaman 
     409 
     410 Updated version number to vlc-0.7.1 
     411 
     4122004-02-09 Monday 17:42  titer 
     413 
     414  macosx/* : macosx-opengl-effect now accept cube and transparent-cube 
     415 
     4162004-02-09 Monday 16:12  sigmunau 
     417 
     418 src/extra/libc.c: 
     419  * fixed a nasty bug in vlc_atoll.(closes #1763) 
     420 
     4212004-02-09 Monday 14:02  titer 
     422 
     423  macosx/vout.m : oops, fixed broken ratio from my last commit 
     424 
     4252004-02-09 Monday 13:28  titer 
     426 
     427  macosx/* : added --macosx-opengl-effect, current possible values are 
     428    "none" and "cube". Sorry, couldn't resist ;) 
     429 
     4302004-02-09 Monday 12:54  hartman 
     431 
     432 * added dtsdec, 're' upgrade of libmad 
     433 
     4342004-02-09 Monday 10:44  sigmunau 
     435 
     436 share/http/admin/dboxfiles.html: 
     437  * Updated for bookmark support. 
     438    See http://www.giggo.de/dbox2/movieplayer.html for details 
     439    (patch by Christof Baumgaertner) 
     440 
     4412004-02-08 Sunday 23:49  gbazin 
     442 
     443 * modules/gui/skins2/Modules.am: added missing file for make dist. 
     444 
     4452004-02-08 Sunday 23:39  gbazin 
     446 
     447 * ALL: I am a morron. 
     448 
     4492004-02-08 Sunday 22:37  gbazin 
     450 
     451 * modules/codec/ffmpeg/video.c: another fix for switching postproc on the fly. 
     452 
     4532004-02-08 Sunday 22:06  gbazin 
     454 
     455 * configure.ac: forgot one version number and added the aiff demux. 
     456 
     4572004-02-08 Sunday 21:36  gbazin 
     458 
     459 * ALL: bumped version number to 0.7.1 in preparation for the release. 
     460 
    14612004-02-08 Sunday 21:00  jpsaman 
    2462 
  • NEWS

    rdcc4cf2 rf982997  
    1 $Id: NEWS,v 1.83 2004/02/10 17:36:45 gbazin Exp $ 
     1$Id: NEWS,v 1.84 2004/02/22 00:15:33 gbazin Exp $ 
    22Changes between 0.7.0 and 0.7.1: 
    33--------------------------------- 
     
    2424 * New PVA demux. 
    2525 * New MOD audio demux. 
    26  * Support for DTS wav files. 
    27  * Support for DTS audio CD. 
     26 * Support for DTS and A52/AC3 wav files. 
     27 * Support for DTS and A52/AC3 audio CD. 
    2828 * New and experimental DVD input plugin with menus support (using libdvdnav). 
    2929 
     
    3131 * MP4/MOV muxer improvements (fast-start, aac in mov, etc...). 
    3232 * Fixed a nasty bug in the mpeg video packetizer. 
     33 * Improved transcoding (multithreading, more tuning, etc...). 
    3334 
    3435Service discovery: 
     
    4041Win32 port: 
    4142 * A few improvements to the DirectShow input plugin. 
     43 * Fixed ipv6 name resolution. 
    4244 
    4345Changes between 0.6.2 and 0.7.0: 
  • configure.ac

    re15880c rf982997  
    11dnl Autoconf settings for vlc 
    2 dnl $Id: configure.ac,v 1.182 2004/02/20 22:07:51 gbazin Exp $ 
    3  
    4 AC_INIT(vlc,0.7.1-test1
     2dnl $Id: configure.ac,v 1.183 2004/02/22 00:15:33 gbazin Exp $ 
     3 
     4AC_INIT(vlc,0.7.1-test2
    55 
    66CONFIGURE_LINE="$0 $*" 
     
    1414dnl XXX: we don't put any flags here, because automake 1.5 doesn't support 
    1515dnl them. And we need the comma otherwize automake will choke on it. 
    16 AM_INIT_AUTOMAKE(vlc,0.7.1-test1
     16AM_INIT_AUTOMAKE(vlc,0.7.1-test2
    1717AM_CONFIG_HEADER(config.h) 
    1818 
  • extras/MacOSX/Resources/English.lproj/InfoPlist.strings

    r8027983 rf982997  
    22 
    33CFBundleName = "VLC"; 
    4 CFBundleShortVersionString = "0.7.1-test1"; 
    5 CFBundleGetInfoString = "VLC media player 0.7.1-test1, Copyright (c) 1996-2004 VideoLAN."; 
     4CFBundleShortVersionString = "0.7.1-test2"; 
     5CFBundleGetInfoString = "VLC media player 0.7.1-test2, Copyright (c) 1996-2004 VideoLAN."; 
    66NSHumanReadableCopyright = "Copyright (c) 1996-2004 VideoLAN."; 
  • extras/MacOSX/vlc.pbproj/project.pbxproj

    r8027983 rf982997  
    526526    <string>VLC</string> 
    527527    <key>CFBundleGetInfoString</key> 
    528     <string>VLC media player 0.7.1-test1, Copyright (c) 1996-2003 VideoLAN.</string> 
     528    <string>VLC media player 0.7.1-test2, Copyright (c) 1996-2003 VideoLAN.</string> 
    529529    <key>CFBundleIconFile</key> 
    530530    <string>vlc.icns</string> 
     
    538538    <string>APPL</string> 
    539539    <key>CFBundleShortVersionString</key> 
    540     <string>0.7.1-test1</string> 
     540    <string>0.7.1-test2</string> 
    541541    <key>CFBundleSignature</key> 
    542542    <string>VLC#</string> 
     
    585585    </array> 
    586586    <key>CFBundleVersion</key> 
    587     <string>0.7.1-test1</string> 
     587    <string>0.7.1-test2</string> 
    588588    <key>NSAppleScriptEnabled</key> 
    589589    <string>YES</string> 
  • include/video_output.h

    reff9d25 rf982997  
    33 ***************************************************************************** 
    44 * Copyright (C) 1999, 2000 VideoLAN 
    5  * $Id: video_output.h,v 1.107 2003/12/11 23:12:46 gbazin Exp $ 
     5 * $Id: video_output.h,v 1.108 2004/02/22 00:15:33 gbazin Exp $ 
    66 * 
    77 * Authors: Vincent Seguin <seguin@via.ecp.fr> 
     
    207207VLC_EXPORT( void,            vout_InitFormat,     ( video_frame_format_t *, uint32_t, int, int, int ) ); 
    208208VLC_EXPORT( void,            vout_InitPicture,    ( vlc_object_t *, picture_t *, uint32_t, int, int, int ) ); 
    209 VLC_EXPORT( void,            vout_AllocatePicture,( vout_thread_t *, picture_t *, uint32_t, int, int, int ) ); 
     209VLC_EXPORT( void,            vout_AllocatePicture,( vlc_object_t *, picture_t *, uint32_t, int, int, int ) ); 
    210210VLC_EXPORT( void,            vout_DestroyPicture, ( vout_thread_t *, picture_t * ) ); 
    211211VLC_EXPORT( void,            vout_DisplayPicture, ( vout_thread_t *, picture_t * ) ); 
  • src/video_output/vout_pictures.c

    r1e67ea6 rf982997  
    33 ***************************************************************************** 
    44 * Copyright (C) 2000-2004 VideoLAN 
    5  * $Id: vout_pictures.c,v 1.45 2004/01/25 17:16:06 zorglub Exp $ 
     5 * $Id: vout_pictures.c,v 1.46 2004/02/22 00:15:33 gbazin Exp $ 
    66 * 
    77 * Authors: Vincent Seguin <seguin@via.ecp.fr> 
     
    166166    if( p_freepic != NULL ) 
    167167    { 
    168         vout_AllocatePicture( p_vout, p_freepic, p_vout->render.i_chroma, 
     168        vout_AllocatePicture( VLC_OBJECT(p_vout), 
     169                              p_freepic, p_vout->render.i_chroma, 
    169170                              p_vout->render.i_width, p_vout->render.i_height, 
    170171                              p_vout->render.i_aspect ); 
     
    456457 * how it gets displayed. 
    457458 *****************************************************************************/ 
    458 void vout_AllocatePicture( vout_thread_t *p_vout, picture_t *p_pic, 
     459void vout_AllocatePicture( vlc_object_t *p_this, picture_t *p_pic, 
    459460                           vlc_fourcc_t i_chroma, 
    460461                           int i_width, int i_height, int i_aspect ) 
     
    462463    int i_bytes, i_index; 
    463464 
    464     vout_InitPicture( VLC_OBJECT(p_vout), p_pic, i_chroma, 
     465    vout_InitPicture( p_this, p_pic, i_chroma, 
    465466                      i_width, i_height, i_aspect ); 
    466467