Merge commit '97de206b44a48da726807cc3e7b9448a8112760b'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 11:47:10 +0000 (12:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 11:47:10 +0000 (12:47 +0100)
commit252f56636ca0fc1d5223d091b1d56f6a5ab2b8af
tree499c8f42e24bedcadf8e88ab5af5f53a40d20293
parent84f972f9944ad29712c70f22bd55b2b12171abf8
parent97de206b44a48da726807cc3e7b9448a8112760b
Merge commit '97de206b44a48da726807cc3e7b9448a8112760b'

* commit '97de206b44a48da726807cc3e7b9448a8112760b':
  lavc: disable CRC checking by default

Conflicts:
libavcodec/options_table.h

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