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

[Ronald S. Bultje]

Hi,

On Fri, Aug 29, 2008 at 7:29 PM, Stefano Sabatini
<stefano.sabatini-lala at poste.it> wrote:
> On date Friday 2008-08-29 01:20:00 +0200, Stefano Sabatini wrote:
>> On date Friday 2008-08-29 00:28:06 +0200, Diego Biurrun wrote:
>> > On Thu, Aug 28, 2008 at 03:01:26AM +0200, Aurelien Jacobs wrote:
>> > > M?ns Rullg?rd wrote:
>> > > > Aurelien Jacobs <aurel at gnuage.org> writes:
>> > > > > rbultje wrote:
>> > > > >
>> > > > >> --- (empty file)
>> > > > >> +++ trunk/libavformat/internal.h     Thu Aug 28 01:43:28 2008
>> > > > >> @@ -0,0 +1,26 @@
>> > > > >> +
>> > > > >> +#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.
>> > >
>> > > So would you agree renaming all of them to AVFORMAT_*, AVCODEC_*, etc ?
>> > > Would anyone be against it ?
>> >
>> > I think we/I chose FFMPEG_ for simplicity back then.  I agree that
>> > AVCODEC_ etc. is the better solution in the long run.
>>
>> I'm all for it too, it would avoid potentially nasty-to-debug issues.
>>
>> A simple script could do the work.
>
> Script and patch attached.
>
> Rule applied to transform filename in the guard name:
> libavfoo/foo/bar/one_two_three.h -> AVFOO_FOO_BAR_ONE_TWO_THREE_H

Index: libavcodec/avcodec.h
===================================================================
--- libavcodec/avcodec.h	(revision 15043)
+++ libavcodec/avcodec.h	(working copy)
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */

-#ifndef FFMPEG_AVCODEC_H
-#define FFMPEG_AVCODEC_H
+#ifndef AVCODEC_AVCODEC_H
+#define AVCODEC_AVCODEC_H

 /**
  * @file avcodec.h
@@ -3075,4 +3075,4 @@
 #define AVERROR_NOENT       AVERROR(ENOENT)  /**< No such file or directory. */
 #define AVERROR_PATCHWELCOME    -MKTAG('P','A','W','E') /**< Not yet
implemented in FFmpeg. Patches welcome. */

-#endif /* FFMPEG_AVCODEC_H */
+#endif /* AVCODEC_AVCODEC_H */

That's kind of ugly?

Ronald