[FFmpeg-cvslog] Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov  1 10:39:50 2013 +0100| [a2bfee36b70bc9a5dd0a5a1cef36ca32bc1fba07] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2bfee36b70bc9a5dd0a5a1cef36ca32bc1fba07
---