Changeset 0460b9b in ffmpeg

Timestamp:

Oct 29, 2013, 8:38:53 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a8fe8d4f

Parents:

15b1b08 (diff), c872d310 (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 'c872d310cd9c605e5f994ad8ac79dc72303c0d29'

• commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29': avconv: stop accessing AVStream.parser

Conflicts:

ffmpeg.h

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

(No files)