[FFmpeg-devel] [PATCH] RTMPE support

[Howard Chu]

M?ns Rullg?rd wrote:
> Howard Chu<hyc at highlandsun.com>  writes:
>> Index: configure
>> ===================================================================
>> --- configure	(revision 22672)
>> +++ configure	(working copy)

>> @@ -2613,6 +2615,7 @@
>>   enabled libopencore_amrnb&&  require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb -lm
>>   enabled libopencore_amrwb&&  require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb -lm
>>   enabled libopenjpeg&&  require libopenjpeg openjpeg.h opj_version -lopenjpeg
>> +enabled librtmp&&  require librtmp librtmp/rtmp.h RTMP_Init -lrtmp
>
> Please maintain alignment.

The patch I posted was aligned with the prevailing code. "libopenjpeg" and 
"libschroedinger" are both longer than the prevailing indents so it looks 
unaligned in this context.

>>   enabled libschroedinger&&  add_cflags $(pkg-config --cflags schroedinger-1.0)&&
>>                              require libschroedinger schroedinger/schro.h schro_init $(pkg-config --libs schroedinger-1.0)
>>   enabled libspeex&&  require  libspeex speex/speex.h speex_decoder_init -lspeex

>> 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"
>
Ok.

-- 
   -- Howard Chu
   CTO, Symas Corp.           http://www.symas.com
   Director, Highland Sun     http://highlandsun.com/hyc/
   Chief Architect, OpenLDAP  http://www.openldap.org/project/