Changeset 96b02460 in ffmpeg

Timestamp:

Mar 13, 2014, 8:35:56 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

cbfc9046

Parents:

daded4f8 (diff), b5f112d8 (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 'b5f112d820934ade66e809ef30bfcfc8210929f8'

• commit 'b5f112d820934ade66e809ef30bfcfc8210929f8': configure: Add explicit dsputil dependency to mpegvideoenc

Conflicts:

configure

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

(No files)