Changeset b6ffe8af in ffmpeg

Timestamp:

Oct 13, 2013, 6:28:05 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3ce0edde

Parents:

40ade071 (diff), 9c15ef35 (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> (10/13/13 06:27:03)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/13/13 06:28:05)

Message:

Merge commit '9c15ef35d404fca2adc31276c1eedb11cf485461'

• commit '9c15ef35d404fca2adc31276c1eedb11cf485461': oggparsevorbis: support official chapter extension

Conflicts:

libavformat/oggparsevorbis.c

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

(No files)