[FFmpeg-devel] [PATCH] RTMPE support

[Måns Rullgård]

Howard Chu <hyc at highlandsun.com> writes:

> Howard Chu wrote:
>> M?ns Rullg?rd wrote:
>>> Howard Chu<hyc at highlandsun.com>   writes:
>>>> Index: libavformat/Makefile
>>>> ===================================================================
>>>> --- libavformat/Makefile	(revision 22672)
>>>> +++ libavformat/Makefile	(working copy)
>>>> @@ -274,7 +274,11 @@
>>>>    OBJS-$(CONFIG_GOPHER_PROTOCOL)           += gopher.o
>>>>    OBJS-$(CONFIG_HTTP_PROTOCOL)             += http.o httpauth.o
>>>>    OBJS-$(CONFIG_PIPE_PROTOCOL)             += file.o
>>>> +ifeq ($(CONFIG_LIBRTMP),yes)
>>>> +OBJS-$(CONFIG_LIBRTMP)                   += librtmp.o
>>>> +else
>>>>    OBJS-$(CONFIG_RTMP_PROTOCOL)             += rtmpproto.o rtmppkt.o
>>>> +endif
>>>
>>> Are these supposed to be mutually exclusive?  If so, do this to
>>> configure instead:
>>>
>>> -rtmp_protocol_deps="tcp_protocol"
>>> +rtmp_protocol_deps="tcp_protocol !librtmp"
>
> That doesn't produce the desired effect, it turns off
> CONFIG_RTMP_PROTOCOL. I simply want to switch the handler for
> RTMP_PROTOCOL.

Right, that changes things a bit.  What you have there still isn't
quite what you want.  Try this instead:

RTMP-OBJS-$(CONFIG_LIBRTMP)   = librtmp.o
RTMP-OBJS-$(!CONFIG_LIBRTMP)  = rtmpproto.o rtmppkt.o
OBJS-$(CONFIG_RTMP_PROTOCOL) += $(RTMP-OBJS-yes)

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