Changeset 3fa72de8 in ffmpeg

Timestamp:

Aug 6, 2013, 8:25:32 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

7cbef2ed

Parents:

84bc3170 (diff), 56ee3f9d (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 '56ee3f9de7b9f6090d599a27d33a392890a2f7b8'

• commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8': avconv: distinguish between -ss 0 and -ss not being used

Conflicts:

ffmpeg.c
ffmpeg_opt.c

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

(No files)