Changeset 78e150c5 in ffmpeg

Timestamp:

Nov 10, 2013, 4:37:51 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3e1097b9, a494757b

Parents:

2fbc759d (diff), 08303d77 (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 remote-tracking branch 'qatar/master'

• qatar/master: hwaccel: Simplify ff_find_hwaccel

Conflicts:

libavcodec/mpeg12dec.c

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

(No files)