Changeset 0dd4eff in ffmpeg

Timestamp:

Mar 23, 2014, 11:20:56 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3bf5c059

Parents:

3788b8db (diff), fb7127b (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 'fb7127b2c836b53ad5168887cd12871312c8708d'

• commit 'fb7127b2c836b53ad5168887cd12871312c8708d': build: h264 parser depends on full h264 decoder

Conflicts:

configure

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

(No files)