this is based on previous 6to2channel-resample.patch from ffmpeg2theora
but updated to work with trunk and using av_clip_int16.

* qatar/master:
  ffmpeg: Don't trigger url_interrupt_cb on the first signal
  avoptions: Check the return value from av_get_number
  dct32_sse: eliminate some spills
  Fix dct32() compilation with --disable-yasm

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

Fix warnings.

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

This fixes detectiion of slightly too big dummy frames.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Currently, the url_interrupt_cb callback will abort all IO
after the first received signal. This makes the output files
from e.g. the mov muxer to be unreadable if the transcode is
aborted with ctrl+c.

After this patch, the first signal cleanly breaks out of
the transcoding loop, but won't forcibly abort all IO.
After the second signal is received, the url_interrupt_cb
callback will abort all IO.
Signed-off-by: Martin Storsjö <martin@martin.st>

This avoids doing a division by zero if the option wasn't found,
or wasn't an option of an appropriate type.
Signed-off-by: Martin Storsjö <martin@martin.st>

More consistent/readable.

The new function accepts a slightly more intuitive order of paramters,
and returns an error code, thus allowing applications to report a
meaningful error message.

Address trac issue #33.

125->104 cycles on penryn (x86_64 only)

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

* qatar/master:
  ffmpeg: get rid of the -vglobal option.
  dct32: Add AVX implementation of 32-point DCT
  dct32: Change pass 6 permutation to allow for AVX implementation
  dct32: port SSE 32-point DCT to YASM
  multiple inclusion guard cleanup
  avio: document buffer must created with av_malloc() and friends
  avio: check AVIOContext malloc failure
  swscale: point out an alternative to sws_getContext
  svq3: Do initialization after parsing the extradata
  add changelog entries for 0.7_beta2
  mp3lame: add #include required for AV_RB32 macro.

Conflicts:
	Changelog
	libavcodec/svq3.c
	libavcodec/x86/dct32_sse.c
	libavfilter/vsrc_buffer.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Rename "default" -> "output1", "default2" -> output2.

Improve logical coherence, fix nit.

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

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

It's badly documented and does the same thing as -flags global_header,
so it's redundant.

Create a stereo_mode metadata tag to specify the stereo 3d video layout using the StereoMode tag in a matroska/webm video track.

Commited by michael, for detailed authorship see soc repo

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

Add missing multiple inclusion guards; clean up #endif comments;
add missing library prefixes; keep guard names consistent.

Else a later buffer resize in ffio_set_buf_size() will ABORT.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>

If done before, some parameters aren't known yet.

With svq3/rtp, initializing before some parameters are known
can lead to calling av_malloc(0), which on OS X currently returns
broken pointers.

libavformat/riff.c has been writing channel_layout for as long as
the field exists.