Changeset 8e7c8325 in ffmpeg

Timestamp:

Jul 9, 2014, 7:44:25 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9098f0ec

Parents:

4b13ec69 (diff), 3f3232a3 (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 '3f3232a371cc88696184d9aef1f812656264e56c'

• commit '3f3232a371cc88696184d9aef1f812656264e56c': avconv: set the output stream timebase

Conflicts:

ffmpeg.c

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

(No files)