Changeset 4a59994e in ffmpeg

Timestamp:

Mar 4, 2014, 8:55:16 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

adaba6a1

Parents:

b2880a3d (diff), a18ef7a7 (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 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54'

• commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54': doc: fix a couple of typos in frame.h

Conflicts:

libavutil/frame.h

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

(No files)