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

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

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

* qatar/master:
  lavr: add x86-optimized functions for mixing 1-to-2 s16p with flt coeffs
  lavr: add x86-optimized functions for mixing 1-to-2 fltp with flt coeffs
  Add Dolby/DPLII downmix support to libavresample
  vorbisdec: replace div/mod in loop with a counter
  fate: vorbis: add 5.1 surround test
  rtpenc: Allow requesting H264 RTP packetization mode 0
  configure: Sort the library listings in the help text alphabetically
  dwt: remove variable-length arrays
  RTMPT protocol support
  http: Properly handle chunked transfer-encoding for replies to post data
  http: Fail reading if the connection has gone away
  amr: Mark an array const
  amr: More space cleanup
  rtpenc: Fix memory leaks in the muxer open function

Conflicts:
	Changelog
	configure
	doc/APIchanges
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

compared to qsort this is slower but its stable and doesnt have a O(n^2) worst
case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>

about 2-5 times faster than gnu libcs qsort()
And should be 100% binary identical across platforms.

I will bump the version once the API is certainly stable and
everyone is happy with the API.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

2x speedup of surround decoding on Cortex-A9.
Signed-off-by: Mans Rullgard <mans@mansr.com>

Signed-off-by: Mans Rullgard <mans@mansr.com>

This requires all NAL units to fit within single RTP packets. It
doesn't change the actual packetization for packets that fit, but
errors out and gives a helpful hint if the NAL units would have to
be split, and signals the right packetization mode in the SDP.
Signed-off-by: Martin Storsjö <martin@martin.st>

Only these three libraries were out of order, the rest was already
neatly sorted.
Signed-off-by: Martin Storsjö <martin@martin.st>

This avoids the "Output file is empty" warning
with subtitles-only files.

Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>

Fixes ticket #1215

Signed-off-by: Mans Rullgard <mans@mansr.com>

* cus/stable:
  ffplay: fix -vismv 1
  ffplay: rename buffer source instance from "src" to "ffplay_buffer"
  ffplay: use key=val syntax for the buffersrc args
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  amr: Cosmetic cleanup
  mov_chan: Fix operator precedence by adding parentheses
  doc: Add missing protocols to list of supported protocols.
  tcp: Check the listen call

Conflicts:
	libavformat/amr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This adds two protocols, but one of them is an internal implementation
detail just used as an abstraction layer/generalization in the code. The
RTMPT protocol implementation uses rtmphttp:// as an alternative to the
tcp:// protocol. This allows moving most of the lower level logic out
from the higher level generic rtmp code.
Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Martin Storsjö <martin@martin.st>

This can happen if doing a new request using the same socket,
but the new request failed, which clears the urlcontext.
Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Martin Storsjö <martin@martin.st>

This was missed in the previous cleanup patch.
Signed-off-by: Martin Storsjö <martin@martin.st>

Also return a proper error code in these cases.
Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>

The new name is more descriptive.
Signed-off-by: Marton Balint <cus@passwd.hu>

Fix warning:
[src @ ...] Flat options syntax is deprecated, use key=value pairs.
Signed-off-by: Marton Balint <cus@passwd.hu>

Fixes ticket1403
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This should fix --enable-hardcoded-tables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Add spaces around operators, fix brace placement and whitespace to
match K&R style, vertically align code, remove redundant != 0 and
convert x == 0 into !x, drop useless braces.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

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

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

Signed-off-by: Martin Storsjö <martin@martin.st>