ppc: cosmetics: Consistently format CPU flag detection invocations
x86: Add and use more convenience macros to check CPU extension availability
x86: avcodec: Use convenience macros to check for CPU flags
x86: avcodec: Consistently structure CPU extension initialization
ppc: don't return a value from a function declared void

Signed-off-by: Martin Storsjö <martin@martin.st>
doc/encoders: reformat libmp3lame doc

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
doc/encoders: reformat and add some clarification in libtwolame doc

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Merge commit 'a6b650118543e1580e872896d8976042b7c32d01'

* commit 'a6b650118543e1580e872896d8976042b7c32d01':
  ppc: cosmetics: Consistently format CPU flag detection invocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ppc: don't return a value from a function declared void

Signed-off-by: Martin Storsjö <martin@martin.st>
Merge commit '79aec43ce813a3e270743ca64fa3f31fa43df80b'

* commit '79aec43ce813a3e270743ca64fa3f31fa43df80b':
  x86: Add and use more convenience macros to check CPU extension availability

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0'

* commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0':
  x86: avcodec: Use convenience macros to check for CPU flags

Conflicts:
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/hpeldsp_init.c
	libavcodec/x86/motion_est.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/x86/vp8dsp: Fix cpu flag checks so they work

Broken by 6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/x86/lpc: Fix cpu flag checks so they work

Broken by 6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'e998b56362c711701b3daa34e7b956e7126336f4'

* commit 'e998b56362c711701b3daa34e7b956e7126336f4':
  x86: avcodec: Consistently structure CPU extension initialization

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ppc: don't return a value from a function declared void

See: 01a82f1dc544df7a4affb3858d12b7b2e492cbba

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffv1dec: Check bits_per_raw_sample and colorspace for equality in ver 0/1 headers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/mpegvideo: reduce log level for messages about allocating frames.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
cmdutils: silence warning about incompatible pointer types

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Fix compilation with --disable-mmx.
Reinstate proper FFmpeg license for all files.