Changeset 3f2f87cd in ffmpeg

Timestamp:

Jun 17, 2014, 11:44:24 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

cb037b5d

Parents:

9f028b3f (diff), 74bc9458 (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 '74bc9458057f07c0820c3d3264396c4c64442e47'

• commit '74bc9458057f07c0820c3d3264396c4c64442e47': flvenc: Don't over-count metadata.

Conflicts:

tests/ref/lavf/flv_fmt
tests/ref/vsynth/vsynth1-flashsv
tests/ref/vsynth/vsynth1-flv
tests/ref/vsynth/vsynth2-flashsv
tests/ref/vsynth/vsynth2-flv

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

(No files)