From 3bbe897e247d128cf63f1fad665fdfc086bab5ab Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 20 Jan 2008 17:16:39 +0000 Subject: Fix a ton of illegal identifiers. Identifiers starting with __ or _ and a capital letter are reserved for the system, those starting with _ are reserved at the file level. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25822 b3059339-0415-0410-9bf9-f77b7e298cf2 --- loader/dshow/cmediasample.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'loader/dshow/cmediasample.c') diff --git a/loader/dshow/cmediasample.c b/loader/dshow/cmediasample.c index f4234bf3d5..53fd8124cd 100644 --- a/loader/dshow/cmediasample.c +++ b/loader/dshow/cmediasample.c @@ -504,12 +504,12 @@ static void CMediaSample_ResetPointer(CMediaSample* This) * \brief CMediaSample constructor * * \param[in] allocator IMemallocator interface of allocator to use - * \param[in] _size size of internal buffer + * \param[in] size size of internal buffer * * \return pointer to CMediaSample object of NULL if error occured * */ -CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int _size) +CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int size) { CMediaSample* This = (CMediaSample*) malloc(sizeof(CMediaSample)); if (!This) @@ -522,11 +522,11 @@ CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int _size) // anyway this is fixes the problem somehow with some reserves // // using different trick for now - in DS_Audio modify sample size - //if (_size < 0x1000) - // _size = (_size + 0xfff) & ~0xfff; + //if (size < 0x1000) + // size = (size + 0xfff) & ~0xfff; This->vt = (IMediaSample_vt*) malloc(sizeof(IMediaSample_vt)); - This->own_block = (char*) malloc((size_t)_size + SAFETY_ACEL); + This->own_block = (char*) malloc((size_t)size + SAFETY_ACEL); This->media_type.pbFormat = 0; This->media_type.pUnk = 0; @@ -557,7 +557,7 @@ CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int _size) This->vt->SetMediaTime = CMediaSample_SetMediaTime; This->all = allocator; - This->size = _size; + This->size = size; This->refcount = 0; // increased by MemAllocator This->actual_size = 0; This->isPreroll = 0; -- cgit v1.2.3