Changeset 70a25587 in ffmpeg

Timestamp:

Feb 24, 2014, 8:08:19 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

fc10ed2

Parents:

e66247e9 (diff), 67f2a68 (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 '67f2a688143b644f99360565a9f36c61a5f052e9'

• commit '67f2a688143b644f99360565a9f36c61a5f052e9': avconv: remove a write-only variable

Conflicts:

ffmpeg.c
ffmpeg.h

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

(No files)