* dwbuiten/master:
  w32threads: Make pthread_cond_wait follow POSIX
Merged-by: Michael Niedermayer <michaelni@gmx.at>

pthread_cond_wait is supposed to return an integer,
and indeed does sometimes. Fix its function declaration
to match its behavior and POSIX.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

We choose the first encoder by default and libaccplus has a
quite limited set of supported bitrates/sample rates.
Thus leading to failure by default in many cases when it is
enabled at compile time.
Moving it down means that the other aac encoders are favored
by default which avoids this issue.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The reason for this is that such files have IndexTableSegments which when parsed
cover EditUnit ranges like this:

 [0,1)
 [249,250)
 [249,377)
 [0,249)

where each interval is [IndexStartPosition,IndexStartPosition+IndexDuration).
This would be reduced to a sparse index like:

 [0,1), [249,250)

instead of the full range:

 [0,249), [249,377)

See TimeCode_HD.mxf, UMID =
060a2b340101010101010410130000000004001aa0e59175025b2a5600da4101.
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: 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>