Changeset ba7cdb97 in ffmpeg

Timestamp:

Mar 17, 2014, 2:51:45 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1c79ca27

Parents:

c738ffcf (diff), 6d78e852 (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> (03/17/14 14:51:13)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/17/14 14:51:45)

Message:

Merge commit '6d78e852fbf3cab438a2085bcb64b90457c4a851'

• commit '6d78e852fbf3cab438a2085bcb64b90457c4a851': img2: add j2c file extension

Conflicts:

libavformat/img2enc.c

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

(No files)