Changeset 66722b4b in ffmpeg

Timestamp:

Aug 18, 2013, 10:00:17 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

45975ab7

Parents:

338f8b2e (diff), c34a96a (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> (08/18/13 09:50:47)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/18/13 10:00:17)

Message:

Merge commit 'c34a96a5ddfa390ce2a352eca79190766c9056d4'

• commit 'c34a96a5ddfa390ce2a352eca79190766c9056d4': dxa: fix decoding of first I-frame by separating I/P-frame decoding

Conflicts:

libavcodec/dxa.c

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

(No files)