* 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>

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>

* commit 'a36947c1':
  dsputilenc_mmx: K&R formatting cosmetics

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

* commit '38675229':
  dsputil_mmx: K&R formatting cosmetics

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

* commit '6a8b35dc':
  dsputilenc_mmx: Merge two assignment blocks with identical conditions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '945673f7':
  dsputil_template: K&R formatting cosmetics

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

* commit 'acd2b8e4':
  rnd_avg.h: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '05563cca':
  dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names

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

* commit '635ec127':
  dsputil: Merge variable declarations and initializations

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

* commit 'bb12c2e9':
  dsputil: K&R formatting cosmetics

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

* commit '503dda7d':
  dsputil.h: K&R formatting cosmetics

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

* commit '8199bb7b':
  dsputil.h: Clean up comments

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

* commit '0a8f91b1':
  dsputil: Remove disabled avg_no_rnd_qpel leftovers
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '55519926':
  x86: Make function prototype comments in assembly code consistent

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

* commit 'edd1f833':
  x86: h264_idct_10_bit: Use proper type in function prototype comments
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '831a1180':
  Update dsputil- and SIMD-related comments to match reality more closely

Conflicts:
	libavcodec/x86/hpeldsp.asm
	libavutil/arm/float_dsp_init_arm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>