Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Nov 2013 16:37:51 +0000 (17:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Nov 2013 16:37:51 +0000 (17:37 +0100)
commit78e150c5e9bb5a628d00562ade1fd4bf3635fc4d
tree7d0ec6dc63bd5a309821e9198d254a14f93fd87b
parent2fbc759d08cae97f9361e464a685a149c9d12c72
parent08303d774132775d49d4ba767092de5d426f089d
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hwaccel: Simplify ff_find_hwaccel

Conflicts:
libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/internal.h
libavcodec/mpeg12dec.c
libavcodec/utils.c
libavcodec/vc1dec.c