[FFmpeg-devel] [PATCH] don't install rtsp.h [was: document rtsp.h]

[Ronald S. Bultje]

Hi,

On Fri, Feb 6, 2009 at 7:34 AM, Michael Niedermayer <michaelni at gmx.at> wrote:
> On Thu, Feb 05, 2009 at 05:41:38PM -0500, Ronald S. Bultje wrote:
>> On Thu, Feb 5, 2009 at 12:27 PM, Michael Niedermayer <michaelni at gmx.at> wrote:
>> > On Thu, Feb 05, 2009 at 09:24:21AM -0500, Ronald S. Bultje wrote:
>> >> +    /**
>> >> +     * This is not part of the public API and shouldn't be used outside ffmpeg.
>> >> +     */
>> >>      RTSP_TRANSPORT_LAST
>> >
>> > this stateent makes it look like the rest is part of the public API, is
>> > it so?
>>
>> Not sure, really. I'm hoping we can stop installing rtsp.h, then it
>> isn't and the comment can be removed. Luca? I guess we should remove
>> the comments once we stop installing rtsp.h.
>
> what breaks if its not installed? users really have no business bypassing
> libav* API and acces demuxers behinds its back

OK, attached patch prevents installing rtsp.h.

What breaks is an application like ffserver.c if it were maintained
outside of the ffmpeg source tree. Of course it isn't so we don't
care, it's more conceptually. then again, it's broken already anyway
since it depends on all kind of rtp/sdp headers that are not
installed.

I'll remove the offending "This is not part of API" lines from my
documentation patch as well.

Ronald
-------------- next part --------------
Index: ffmpeg-svn/libavformat/Makefile
===================================================================
--- ffmpeg-svn.orig/libavformat/Makefile	2009-02-03 21:40:15.000000000 -0500
+++ ffmpeg-svn/libavformat/Makefile	2009-02-06 07:42:43.000000000 -0500
@@ -3,7 +3,7 @@
 NAME = avformat
 FFLIBS = avcodec avutil
 
-HEADERS = avformat.h avio.h rtsp.h rtspcodes.h
+HEADERS = avformat.h avio.h
 
 OBJS = allformats.o cutils.o metadata.o metadata_compat.o options.o os_support.o sdp.o utils.o
 
Index: ffmpeg-svn/libavformat/rtsp.h
===================================================================
--- ffmpeg-svn.orig/libavformat/rtsp.h	2009-02-05 20:33:22.000000000 -0500
+++ ffmpeg-svn/libavformat/rtsp.h	2009-02-06 07:42:21.000000000 -0500
@@ -31,9 +31,6 @@
     RTSP_LOWER_TRANSPORT_UDP = 0,
     RTSP_LOWER_TRANSPORT_TCP = 1,
     RTSP_LOWER_TRANSPORT_UDP_MULTICAST = 2,
-    /**
-     * This is not part of public API and shouldn't be used outside of ffmpeg.
-     */
     RTSP_LOWER_TRANSPORT_LAST
 };