Changeset 16310e36 in ffmpeg

Timestamp:

Jun 28, 2013, 8:14:16 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

22364567

Parents:

831e749b (diff), 41f3c60f (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (06/28/13 08:14:12)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/28/13 08:14:16)

Message:

Merge remote-tracking branch 'cehoyos/master'

• cehoyos/master: Avoid a null pointer dereference in avcodec_decode_video2(). Set block_align when reading QDM2 in mov. Fix muxing QDM2 mono into caf.

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

(No files)