Changeset 62e10c37 in ffmpeg

Timestamp:

Nov 23, 2013, 1:31:15 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3e641b4

Parents:

94194bdc (diff), 07fd0a22 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (11/23/13 13:26:27)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/23/13 13:31:15)

Message:

Merge commit '07fd0a22192805d56c635eb294dc26b0a54ae325'

• commit '07fd0a22192805d56c635eb294dc26b0a54ae325': avconv: add infrastructure for using hwaccels

Conflicts:

ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c

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

(No files)