Michael Niedermayer a2bfee36b7 Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e' ...

* commit '9af7a8523a6bb517834ebed36093bdab11a8b38e':
  HNM4/HNM4A demuxer & video decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/version.h

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

2013-11-01 10:46:39 +01:00

5.5 KiB

Raw Blame History

View Raw