Changeset d1c35977 in ffmpeg

Timestamp:

May 1, 2014, 4:03:55 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

58f4d126

Parents:

b917d702 (diff), e7fc9796 (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> (05/01/14 16:00:27)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/01/14 16:03:55)

Message:

Merge commit 'e7fc9796d82abc99ef0af71027fb9aaa5311d137'

• commit 'e7fc9796d82abc99ef0af71027fb9aaa5311d137': lavc: do not use AVCodecContext.codec_name in avcodec_string()

Conflicts:

libavcodec/utils.c

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

(No files)