Changeset 252f5663 in ffmpeg

Timestamp:

Oct 28, 2013, 11:47:10 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a1ce060c

Parents:

84f972f9 (diff), 97de206b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '97de206b44a48da726807cc3e7b9448a8112760b'

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

Conflicts:

libavcodec/options_table.h

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

(No files)