Merge branches 'stagefright' and 'stagefright-test' into stagefright-test
avutil: add better documentation for AVSampleFormat
rtmp: Support 'rtmp_app', an option which overrides the name of application

This option is the name of application to connect on the RTMP server.
Sometimes the URL parser cannot determine the app name automatically,
so it must be given explicitly using this option (ie. -rtmp_app).

Signed-off-by: Martin Storsjö <martin@martin.st>
rtmp: Support 'rtmp_playpath', an option which overrides the stream identifier

This option is the stream identifier to play or to publish.
Sometimes the URL parser cannot determine the correct
playpath automatically, so it must be given explicitly
using this option (ie. -rtmp_playpath).

Signed-off-by: Martin Storsjö <martin@martin.st>
faac: Add .channel_layouts
faac: Fix multi-channel ordering

Signed-off-by: Alex Converse <alex.converse@gmail.com>
aacdec: More robust output configuration.

Save the old output configuration (if it has been used
successfully) when trying a new configuration. If the new configuration
fails to decode, restore the last successful configuration.
avplay: update get_buffer to be inline with avconv

The buffer must have its dimension, pixel format and aspect ratio
set.
avconv: only set the "channels" option when it exists for the specified input format

This allows the user to specify an input channel layout without avconv aborting because the
"channels" option was not found.
riff: use bps instead of bits_per_coded_sample in the WAVEFORMATEXTENSIBLE header

This matches the value for the plain WAVEFORMATEX header.
Also fixes stream copy to WAVE for non-16-bit raw pcm.
proresenc: multithreaded quantiser search
dv_tablegen: Drop unnecessary av_unused attribute from dv_vlc_map_tableinit().
aacenc: Fix issues with huge values of bit_rate.

Do not pointlessly call ff_alloc_packet multiple times,
and fix an infinite loop by clamping the maximum
number of bits to target in the algorithm that does
not use lambda.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
matroskadec: check headerstrip data availability.

Fixes null ptr dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avidec: document early_exit argument

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avidec: Dont crash on avi packets that belong to dv streams in dv in avi

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
nuv: check buffer size before checking content.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
CrystalHD: fix pStride value.

Signed-off-by: sebist <sebok.istvan@gmail.com>
Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
CrystalHD: Set aspect ratio.

Signed-off-by: sebist <sebok.istvan@gmail.com>
Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
yadif: Improve pts calculation for is_second.

Tested-by: Robert Nagy <ronag89@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>