Merge commit '23a211cbba0b7c9ee694040031b2e5da1be54a00'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 11:34:35 +0000 (12:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 11:34:35 +0000 (12:34 +0100)
commit84f972f9944ad29712c70f22bd55b2b12171abf8
tree0a7b495dc78053710fbfff6ab6b4e36b5c483321
parent528f5cdd2cf1c54f3f1b983964993c698ff91aca
parent23a211cbba0b7c9ee694040031b2e5da1be54a00
Merge commit '23a211cbba0b7c9ee694040031b2e5da1be54a00'

* commit '23a211cbba0b7c9ee694040031b2e5da1be54a00':
  lavc: change all decoders to behave consistently with AV_EF_CRCCHECK.

Conflicts:
libavcodec/avcodec.h
libavcodec/tta.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ac3dec.c
libavcodec/alsdec.c
libavcodec/avcodec.h
libavcodec/takdec.c
libavcodec/tta.c
libavcodec/wavpack.c