git.ffmpeg.org Git - ffmpeg.git/commit

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: Add a new option 'rtmp_pageurl'
  doc: Update the description of the rtmp_tcurl option
  rtmp: Make the description of the rtmp_tcurl option more generic
  libfdk-aacenc: add LATM/LOAS encapsulation support
  sctp: add port missing error message
  tcp: add port missing error message
  avfilter: Fix printf format string conversion specifier

Conflicts:
libavcodec/version.h
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

author	Michael Niedermayer <michaelni@gmx.at>
	Wed, 25 Jul 2012 20:00:06 +0000 (22:00 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Wed, 25 Jul 2012 20:00:06 +0000 (22:00 +0200)
commit	f7d4e26c6a0a11c255e22994fabd97a4e62e3d01
tree	65c18e3f9064ed481b0001beac05e194232260eb	tree \| snapshot
parent	9746f87f154029ed5866cbc02ba0d57f5b5c283f	commit \| diff
parent	758377a2b79a35386978b0af1196d36cbcfb8f64	commit \| diff

doc/protocols.texi	diff1 \|	diff2 \|	blob \| history
libavcodec/libfdk-aacenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/version.h	diff1 \|	diff2 \|	blob \| history
libavformat/rtmpproto.c	diff1 \|	diff2 \|	blob \| history
libavformat/tcp.c	diff1 \|	diff2 \|	blob \| history