Changeset c02945b6 in ffmpeg

Timestamp:

Aug 16, 2013, 12:05:59 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d7ed473d

Parents:

50c08378 (diff), 9d86bfc2 (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> (08/16/13 12:04:57)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/16/13 12:05:59)

Message:

Merge commit '9d86bfc259ae9ba7a76067ec931ff20fbb86ea2a'

• commit '9d86bfc259ae9ba7a76067ec931ff20fbb86ea2a': hlsenc: Don't reset the number variable when wrapping

Conflicts:

libavformat/hlsenc.c

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

(No files)