Changeset d3850ac5 in ffmpeg

Timestamp:

Oct 13, 2013, 8:19:15 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

43dec5ef

Parents:

0c7bd340 (diff), 0cb83c56 (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 '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0'

• commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0': indeo4: Check the block size if reusing the band configuration

Conflicts:

libavcodec/indeo4.c

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

(No files)