Changeset c2df9597 in ffmpeg

Timestamp:

Oct 3, 2013, 7:14:54 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

16bb8faa

Parents:

6565b1ad (diff), be0b4c70 (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 'be0b4c70ec40d7f9ac8e416a4379d4a387421184'

• commit 'be0b4c70ec40d7f9ac8e416a4379d4a387421184': atrac3: Replace a silly counter variable name with plain 'j'

Conflicts:

libavcodec/atrac3.c

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

(No files)