dsputil: Separate h264chroma
rv34: Drop now unnecessary dsputil dependencies
h264chroma: x86: Fix building with yasm disabled

Signed-off-by: Martin Storsjö <martin@martin.st>
flac: don't check the number of channels before setting the channel layout.

This is unnecessary, as ff_flac_set_channel_layout can handle any number of channels.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
flac: add channel layout masks for streams with 7 or 8 channels.

They were added to the latest FLAC specification:
https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2

Signed-off-by: Anton Khirnov <anton@khirnov.net>
h263: remove an unused parameter from ff_h263_decode_init_vlc
h264: remove silly macros

They serve no useful purpose and wreak all kind of havoc when h264.h is
included elsewhere.
error_resilience: remove a useless if() and FIXME

pp_time is never set for h264
rv10: improve buffer size check.

Check slice count and input buffer size before constructing a possibly
invalid pointer, not after.
mpegvideo: remove an unused function parameter
dsputil: x86: Convert h263 loop filter to yasm

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
dsputil: x86: Fix compile error

Accidentally prefixed ff_ with cextern.

Signed-off-by: Martin Storsjö <martin@martin.st>
lavfi: remove disabled code.
lavfi: fix missing space in error message.
Merge commit '79dad2a932534d1155079f937649e099f9e5cc27'

* commit '79dad2a932534d1155079f937649e099f9e5cc27':
  dsputil: Separate h264chroma

Conflicts:
	libavcodec/dsputil_template.c
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/vc1dec.c
	libavcodec/vc1dsp.c

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

* commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc':
  h264chroma: x86: Fix building with yasm disabled
  rv34: Drop now unnecessary dsputil dependencies

Conflicts:
	libavcodec/x86/Makefile

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

* commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0':
  h263: remove an unused parameter from ff_h263_decode_init_vlc
  flac: add channel layout masks for streams with 7 or 8 channels.
  flac: don't check the number of channels before setting the channel layout.

Conflicts:
	libavcodec/version.h

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

* commit 'c5fcdb440237f06f6c954185ab60970cabf786a2':
  error_resilience: remove a useless if() and FIXME
  h264: remove silly macros

Merged-by: Michael Niedermayer <michaelni@gmx.at>
error_resilience: assert that unsupported B frame interpolation isnt used with h264

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

* commit '605b047bcc48482dc8a356f56629da259fbddbf1':
  rv10: improve buffer size check.

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