Michael Niedermayer 268ff17cb7 Merge commit 'c48456166e95648719a8be8f8613f9dee98205c1' ...

* commit 'c48456166e95648719a8be8f8613f9dee98205c1':
  lavc: add MMAL hardware decoder wrapper

Conflicts:
	Changelog
	configure
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/version.h
	libavutil/version.h

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

2015-03-29 11:32:24 +02:00

6.4 KiB

Raw Blame History

View Raw