* commit '78987a88':
  lavf: include 60 fps in guessed standard frame rates
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '53128185':
  atrac3plus: Make initialization dependant on channel count rather than channel map
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9ee9c679':
  x86: videodsp: Fix a bug in a %if statement where we used '%%' instead of '&&'.

See: cd86eb26Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '51daafb0':
  x86: videodsp: Properly mark sse2 instructions in emulated_edge_mc as such.

Conflicts:
	libavcodec/x86/videodsp_init.c

See: 1b3a7e1fMerged-by: Michael Niedermayer <michaelni@gmx.at>

Due to what looks like an off-by-one error 60 * 12 * 1001 / 12 * 1001
is not tested as standard frame rate in avformat_find_stream_info().

Makes it easier to recreate an AVCodecContext for ATRAC3+ decoding,
which is needed in multimedia frameworks, as well as in general cases
where demuxing and decoding are separate entities.

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

This also returns failure if the mkdir failure is not due to an already existing
path.

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

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes wrong error message about empty output file
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

5.40s → 5.30s overall decode time with -threads 1 on ped1080p.webm
(i7 920, ssse3)

* qatar/master:
  doc: document correct option to list encoders

Conflicts:
	doc/encoders.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Janne Grunau <janne-libav@jannau.net>

Should fix crashes or corrupt output on pre-SSE2 CPUs when they were
using SSE2-code (e.g. AMD Athlon XP 2400+ or Intel Pentium III) in
hfix or hvar single-edge (left/right) extension functions.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>

* commit 'a17ab0e4':
  doc: add decoders.texi

Conflicts:
	doc/decoders.texi
	doc/ffmpeg.texi
	doc/ffplay.texi

See: 5e45f034Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '23d461fe':
  ac3dec: Allow asymmetric application of DRC when drc_scale > 1

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

Fixes compilation with --disable-everything --enable-decoder=sonic
and --disable-everything --enable-encoder=sonic.

* cehoyos/master:
  Force automatic thread_count to 1 for cbr mjpeg frame threading.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Constant bit rate mjpeg encoding fails for threads > 1 and frame threading.

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

* qatar/master:
  avformat: utils: Refactor duplicated PRINT macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Only documents ac3 decoder options at this point.

Amplification of quiet sounds is enhanced.
Inspired by gbooker's A52Decoder.

* qatar/master:
  mpeg: Drop unused parameters from ff_draw_horiz_band()

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

This (ugly) hack fixes Ticket3348
If someone has an idea on how to fix this nicer, that would be very welcome
but the stream contains several PMTs with just one of the 2 streams at the start
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This simplifies the following eac3-in-wav patch.

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

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