FFmpeg/libavcodec
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
..
2013-10-23 14:32:04 +02:00
2013-10-30 11:04:06 +00:00
2013-10-28 08:33:21 -04:00
2013-10-30 11:04:06 +00:00
2013-10-03 23:00:09 +02:00
2013-09-04 16:37:25 +02:00
2013-08-13 15:45:08 +02:00
2013-08-13 15:45:08 +02:00
2013-10-30 23:56:52 +01:00
2013-09-25 16:30:25 +02:00
2013-10-15 17:00:28 +01:00
2013-10-06 20:12:37 +00:00
2013-10-08 12:40:33 +00:00
2013-10-08 12:40:33 +00:00
2013-08-13 15:45:08 +02:00
2013-10-15 23:58:20 +02:00
2013-10-18 16:46:08 +02:00
2013-10-29 14:00:29 +00:00
2013-10-27 23:49:50 +01:00
2013-10-27 23:49:50 +01:00
2013-10-28 10:37:11 +01:00
2013-10-31 20:17:18 +01:00
2013-10-15 22:13:02 +02:00
2013-10-15 22:13:02 +02:00
2013-10-15 22:13:02 +02:00
2013-10-13 21:48:28 +02:00
2013-10-28 23:54:28 +01:00
2013-08-07 21:13:12 +02:00
2013-08-12 19:40:29 +02:00
2013-10-30 12:41:43 +00:00
2013-10-29 18:36:21 +01:00
2013-10-23 10:49:48 +02:00
2013-09-21 16:59:13 +02:00
2013-08-26 19:26:01 +00:00
2013-10-22 19:55:47 +02:00
2013-08-09 23:02:48 +02:00
2013-10-28 23:54:28 +01:00
2013-09-21 16:59:13 +02:00
2013-10-22 19:55:47 +02:00
2013-10-27 13:34:35 +01:00
2013-10-02 21:03:11 -04:00
2013-10-30 11:04:06 +00:00