Michael Niedermayer ace0cfea60 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  hwaccel: fix use with frame based multithreading

Conflicts:
	libavcodec/h263dec.c
	libavcodec/version.h

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

2013-03-27 11:51:33 +01:00

35 KiB

Raw Blame History

View Raw