Changeset 785f71fc in ffmpeg

Timestamp:

Nov 13, 2014, 1:21:18 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ecb74886

Parents:

2c4d5d34 (diff), d5d2d6c3 (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> (11/13/14 13:11:46)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/13/14 13:21:18)

Message:

Merge commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a'

• commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a': dcadec: initialize variables before use

Conflicts:

libavcodec/dcadec.c

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

(No files)