Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Should fix compilation with vs2012
Signed-off-by: James Almer <jamrial@gmail.com>

* commit 'e93ca480':
  parseutil: Add more resolution aliases

Conflicts:
	doc/ffmpeg.texi
	libavutil/parseutils.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Add DCI 2k and 4k and uhd1 and uhd2.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes: genio-avi
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Both may be set by user (libavformat) on decoding.

Fixes Ticket4665
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes Ticket4664

The changed fate tests lack red/blue shades and thus look correct
either way
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: James Almer <jamrial@gmail.com>

Signed-off-by: James Almer <jamrial@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Chris Spencer <spencercw@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '69b92f1b':
  qsvenc: properly handle asynchronous encoding

Conflicts:
	libavcodec/qsvenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'f5c4d38c':
  qsvdec: properly handle asynchronous decoding

Conflicts:
	libavcodec/qsvdec.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '6b15874f':
  af_resample: do not touch the timestamps if we are not resampling
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '6d592fbd':
  avconv: split creating and (re-)configuring complex filtergraphs

Conflicts:
	ffmpeg_filter.c
	ffmpeg_opt.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

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

* commit 'be101bc1':
  avconv: create the complex filtergraphs earlier

Conflicts:
	ffmpeg_opt.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '1959351a':
  avconv: move the no streams failure to open_output_file()
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'ab7b0389':
  avconv: factor out the output stream initialization

Conflicts:
	ffmpeg.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'bd2ab27c':
  avconv: use read_file() for reading the 2pass stats

Conflicts:
	cmdutils.c
	cmdutils.h
	ffmpeg_opt.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '6d5d9246':
  avconv: move handling the 2pass logfile into avconv_opt

Conflicts:
	ffmpeg.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '59245e0c':
  avconv: set the encoding/decoding_needed flags earlier

Conflicts:
	ffmpeg.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '56c2f377':
  avconv: drop update_sample_fmt()

Conflicts:
	ffmpeg.c

No change as the removed code is not in FFmpeg
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'e61f3984':
  asfdec: make nb_sub to be unsigned int
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '2883ef34':
  asfdec: read the replicated data in a separate function
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '0989d3ad':
  asfdec: convert condition for the replicated data reading to be safer
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '40662728':
  asfdec: do not read replicated data when their length is 0
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Wait for async_depth frames before syncing.