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

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

* qatar/master:
  codec_desc: group image codecs together

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

* commit 'd42ea067':
  codec_desc: add missing .long_name
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '999d31d3':
  codec_desc: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7a650caf':
  configure: Split some logical blocks off from HAVE_LIST

Conflicts:
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd0adf55c':
  configure: Split some logical blocks off from CONFIG_LIST

Conflicts:
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '07ea8a7e':
  configure: Group and sort function/struct/type checks

Conflicts:
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '36b822b8':
  arm: dsputil: Drop restrict keyword from add_pixels_clamped_armv6 prototype
Merged-by: Michael Niedermayer <michaelni@gmx.at>

AVX2 support was introduced in Yasm 1.2.0, and some distros
like Debian still feature version 1.1.0
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

These ADPCM codecs include a per-frame flag that enables a raw 16-bit mode. Therefore
the the number of samples returned by get_nb_samples() is only ever approximate.

Fixes ticket #3460.
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Group checks into logical groups and sort alphabetically within those groups
unless checks have close coupling. Keep closely coupled checks together.

The function is assigned to a function pointer that does not have the
restrict keyword for that parameter.

This fixes compilation for MSVC builds that don't recognize "restrict",
broken since ed9625eb.

* qatar/master:
  aac: K&R formatting cosmetics

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

* commit '2e708f17':
  ljpeg: fix duplicated pixel format entry

Conflicts:
	libavcodec/ljpegenc.c

No change as there was no duplicate entry in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'eb2b8bce':
  bfin: Use more sensible file names

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

* commit '929ec39e':
  bfin: hpeldsp: Split no_rnd pixel operations off into a separate file
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a7cc4ac9':
  bfin: dsputil: Unconditionally compile hpel pixels code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '13ae97b2':
  bfin: hpeldsp: "nornd" ---> "no_rnd" function name suffix for consistency
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bbf0ef57':
  bfin: Move all assembly declarations only used within one .c file there

Conflicts:
	libavcodec/bfin/dsputil_bfin.h
	libavcodec/bfin/vp3_bfin.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '80173c71':
  bfin: hpeldsp: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'da785231':
  bfin: Refactor duplicated assembly-related macros

Conflicts:
	libavcodec/bfin/hpel_pixels_bfin.S
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e99af2a3':
  bfin: Refactor duplicated l1_text/l1_data_B macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a3e75626':
  bfin: dsputil: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1e33095b':
  bfin: dsputil: Drop broken and trivial profiling code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f5f09976':
  bfin: hpeldsp: Drop broken put_pixels_*_xy2_nornd bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '14efbe69':
  bfin: dsputil: Drop broken vsad bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '671c8785':
  bfin: dsputil: Remove unused global variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'db3f61a0':
  x86: dsputil_init: Drop some unnecessary parentheses
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '441b0939':
  x86: dsputil_init: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4cb4680c':
  x86: dsputil_x86.h: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

* commit 'f8bbebec':
  x86: motion_est: K&R formatting cosmetics

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