Changeset 0d1994ee in ffmpeg

Timestamp:

Jul 6, 2014, 6:11:40 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

195f7bd2

Parents:

225c5cc8 (diff), b0633f83 (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 'b0633f83f277c05bf1f617a99c7aedd2db8306e3'

• commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3': paf: split audio and video decoder

Conflicts:

libavcodec/pafvideo.c

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

(No files)