Merge commit 'c48456166e95648719a8be8f8613f9dee98205c1'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Mar 2015 09:32:24 +0000 (11:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Mar 2015 09:32:24 +0000 (11:32 +0200)
commit268ff17cb785c3ae94be0aca31ed8709e149b487
tree0d8f9f3b52d0430765ef2bfe389cbea1149b4ca8
parentcf16b459a873b990efc10d93e9912ab01b8a0fba
parentc48456166e95648719a8be8f8613f9dee98205c1
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>
Changelog
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/mmaldec.c
libavcodec/version.h
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h