Changeset 3ac51145 in ffmpeg

Timestamp:

Jun 27, 2014, 5:13:34 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1fd0e9a5

Parents:

6d2df3c (diff), e63b818 (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 'e63b818dbe6060b606ae10eb184859f8b97d2353'

• commit 'e63b818dbe6060b606ae10eb184859f8b97d2353': dv: Properly split decoder and encoder initialization

Conflicts:

libavcodec/dv.c

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

(No files)