[FFmpeg-cvslog] r15002 - in trunk/libavformat: internal.h sdp.c utils.c

Måns Rullgård mans
Thu Aug 28 02:50:36 CEST 2008


Aurelien Jacobs <aurel at gnuage.org> writes:

> rbultje wrote:
>
>> Author: rbultje
>> Date: Thu Aug 28 01:43:28 2008
>> New Revision: 15002
>> 
>> Log:
>> Export data_to_hex() as private API in lavf, rename to ff_data_to_hex() and
>> move it from sdp.c into utils.c. Also add new header internal.h specifically
>> for lavf-specific internal API. See discussion in "Realmedia patch" thread
>> on mailinglist.
>> 
>> 
>> 
>> Added:
>>    trunk/libavformat/internal.h
>> Modified:
>>    trunk/libavformat/sdp.c
>>    trunk/libavformat/utils.c
>> 
>> Added: trunk/libavformat/internal.h
>> ==============================================================================
>> --- (empty file)
>> +++ trunk/libavformat/internal.h	Thu Aug 28 01:43:28 2008
>> @@ -0,0 +1,26 @@
>> +/*
>> + * copyright (c) 2001 Fabrice Bellard
>> + *
>> + * This file is part of FFmpeg.
>> + *
>> + * FFmpeg is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU Lesser General Public
>> + * License as published by the Free Software Foundation; either
>> + * version 2.1 of the License, or (at your option) any later version.
>> + *
>> + * FFmpeg is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>> + * Lesser General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU Lesser General Public
>> + * License along with FFmpeg; if not, write to the Free Software
>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>> + */
>> +
>> +#ifndef FFMPEG_AVFORMAT_UTILS_H
>> +#define FFMPEG_AVFORMAT_UTILS_H
>
> Sorry that I didn't catch this when you submitted the patch, but
> here, the multiple inclusion guard should be FFMPEG_INTERNAL_H.
> But now that I think about it. This would cause clashes with
> the multiple inclusion guard from lavu/interal.h.
> I guess that was one of the reason why I preferred AVFORMAT_FILE_H
> as a standard inclusion guard instead of FFMPEG_FILE_H at the time
> this was decided.
> Should we consider a new rename of all inclusion guards ?

It was Diego who renamed them all to FFMPEG_*.  I never understood his
reasoning behind it.

-- 
M?ns Rullg?rd
mans at mansr.com




More information about the ffmpeg-cvslog mailing list