After demuxing, data and side are merged. Before decoding, they are
split. Encoder will perform with data and side split. This means that a
muxer can receive split data (after encoding) but also merged data (if
called directly after demuxing). This commit makes sure data and side
are split for the muxer.

with this change QuickTime is able to play u8 aiff file generated by FFmpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The sample rate and channel layout are negotiated and set
by the filter graph system.

The sample rate and channel layout are negotiated and set
by the filter graph system, the filters must not set them.

Also: fix af_pan and af_aresample, that forgot to update
audio->channels.

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

* qatar/master:
  lavr: add option for dithering during sample format conversion to s16
  mpeg12: do not decode extradata more than once.

Conflicts:
	libavcodec/mpeg12.c
	libavcodec/mpeg12.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c661cb66':
  cmdutils: pass number of groups to split_commandline().
  mov: handle h263 and flv1 for codec_tag 'H','2','6','3'
  h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles

Conflicts:
	libavcodec/h264_ps.c
	libavformat/isom.c
	libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

They are completely superfluous when using av_rescale_q_rnd().
Call av_rescale_rnd() using what used to be the numerators instead.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

These where reduced in f1d8763a
and this change can cause out of array accesses.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  mpegvideo: increase edge_emu_buffer size for VC1
  lavc: merge latest x86inc.asm fixes with x264

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

* commit 'acb571c8':
  avcodec: bump minor for adaptive h264 frame-mt
  avconv: pass the actually selected decoder to filter_codec_opts().

Conflicts:
	Changelog
	ffmpeg_opt.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The old implementation is no longer possibly due to limitations
of the new command line parser.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '77bd1bc7':
  avconv: use new options parser.

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

* commit '0ec1642b':
  cmdutils: don't log an error in opt_default().
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8c9af5b2':
  cmdutils: add a commandline pre-parser.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes CVE-2012-2803.

CC: libav-stable@libav.org

* commit 'a01c02bc':
  cmdutils: split parse_option().
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This makes the code simpler and avoids mixing designated and
non-designated initializers in a potentially unsafe way in avconv.

* commit '10bca661':
  cmdutils: add a macro to simplify grow_array() calls.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge only for metadata, functionality had been previously integrated.

* commit '9e696d2e':
  h264: support frame parameter changes during frame-mt

Conflicts:
	libavcodec/h264.c
Merged-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: Michael Niedermayer <michaelni@gmx.at>

Based on code by Janne Grunau
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

prevents regressions from h264-mt frame size changing code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avoids regression from the h264-mt frame size change code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>