[FFmpeg-devel] [PATCH] RTMPE support

[Måns Rullgård]

Howard Chu <hyc at highlandsun.com> writes:

> Howard Chu wrote:
>> M?ns Rullg?rd wrote:
>>> If shared libs are used there is no problem.  Those who insist on
>>> using static libs can pass extra linker flags as needed.
>>
>> OK, then that makes things much simpler, we just need "-lrtmp" here.
>
> Dropped pkg-config, renamed rtmp2.c to librtmp.c

Just to better understand the situation, why is the librtmp
functionality not merged into libavformat?

> Index: configure
> ===================================================================
> --- configure	(revision 22672)
> +++ configure	(working copy)
> @@ -177,6 +177,7 @@
>    --enable-libnut          enable NUT (de)muxing via libnut,
>                             native (de)muxer exists [no]
>    --enable-libopenjpeg     enable JPEG 2000 decoding via OpenJPEG [no]
> +  --enable-librtmp         enable RTMP[E] support via librtmp [no]
>    --enable-libschroedinger enable Dirac support via libschroedinger [no]
>    --enable-libspeex        enable Speex decoding via libspeex [no]
>    --enable-libtheora       enable Theora encoding via libtheora [no]
> @@ -920,6 +921,7 @@
>      libopencore_amrnb
>      libopencore_amrwb
>      libopenjpeg
> +    librtmp
>      libschroedinger
>      libspeex
>      libtheora

OK

> @@ -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.

>  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
> @@ -2891,6 +2894,7 @@
>  echo "libopencore-amrnb support ${libopencore_amrnb-no}"
>  echo "libopencore-amrwb support ${libopencore_amrwb-no}"
>  echo "libopenjpeg enabled       ${libopenjpeg-no}"
> +echo "librtmp enabled           ${librtmp-no}"
>  echo "libschroedinger enabled   ${libschroedinger-no}"
>  echo "libspeex enabled          ${libspeex-no}"
>  echo "libtheora enabled         ${libtheora-no}"
> 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"

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