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

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

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

* qatar/master:
  Unscaled Planar RGB -> RGB support in swscale.

Conflicts:
	libswscale/swscale_unscaled.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>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

15k->10k cpu cycles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

19k -> 15k cpu cycles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

2500 -> 1900 cpu cycles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes muxing audio-only output resulting in SIGFPE due to lack of EditRate.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* qatar/master:
  FATE: Add RALF decoding test

Conflicts:
	tests/fate/real.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

note the function is used under #if
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Fix map_channel when mapped audio stream index is greater than 0.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Some applications use these combinations and to maintain ABI
compatibility with previous versions we should not suddenly
fail. Thus only display a warning for the newly detected cases
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  vsrc_buffer: allow buffering arbitrary number of frames.
  vf_scale: avoid a pointless memcpy in no-op conversion.
  avfiltergraph: try to reduce format conversions in filters.
  avfiltergraph: add an AVClass to AVFilterGraph on next major bump.
  id3v2: fix skipping extended header in id3v2.4

Conflicts:
	libavfilter/vf_scale.c
	libavfilter/vsrc_buffer.c
	libavformat/id3v2.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>

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: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Replaces FPE by clean error
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

The new code detects NI avis by analyzing the index.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

I.e. just pass the buffer along when src parameters == dst parameters.