Changeset 84f972f9 in ffmpeg

Timestamp:

Oct 28, 2013, 11:34:35 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

252f5663

Parents:

528f5cdd (diff), 23a211cb (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 '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>

(No files)