FFmpeg/libavcodec
Michael Niedermayer b286383bd2 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  asfdec: read attached pictures.
  apetag: reindent
  apetag: export attached covers as video streams.
  apetag: fix the amount of data read from binary tags.
  apetag: make sure avio_get_str() doesn't read more than it should.
  mov: read itunes cover art.
  snow: remove VLA in mc_block()
  intfloat: Don't use designated initializers in the public headers
  snow: remove a VLA.
  doc: Remind devs to check return values, especially for malloc() et al
  MS ATC Screen (aka MSS3) decoder
  vf_yadif: move x86 init code to x86/yadif.c
  vf_gradfun: move x86 init code to x86/gradfun.c
  roqvideo: Remove a totally unused dspcontext
  smacker: remove some unused code
  dsicin: remove dead assignment
  aacdec: remove dead assignment
  rl2: remove dead assignment
  proresenc: make a variable local to the loop where it is used
  alsdec: remove dead assignments

Conflicts:
	Changelog
	doc/developer.texi
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavfilter/gradfun.h
	libavfilter/x86/gradfun.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-02 21:19:41 +02:00
..
2012-04-22 22:26:55 +02:00
2012-06-11 21:40:43 +02:00
2012-05-05 22:04:21 +01:00
2012-05-05 22:04:21 +01:00
2012-06-03 01:53:36 +02:00
2012-05-20 16:29:07 +02:00
2012-06-29 20:20:02 +02:00
2012-06-18 21:44:22 +02:00
2012-05-08 00:25:25 +02:00
2012-05-28 18:20:39 +02:00
2012-06-02 19:56:10 +02:00
2012-06-22 22:47:33 +00:00
2012-04-21 19:28:35 +02:00
2012-05-08 23:18:48 +02:00
2012-05-18 23:34:11 +02:00
2012-05-25 13:40:12 +02:00
2012-05-08 22:04:01 +02:00
2012-06-07 21:31:22 +02:00
2012-06-07 21:32:32 +02:00
2012-05-25 13:40:12 +02:00
2012-06-07 21:07:17 +02:00
2012-06-25 23:10:45 +02:00
2012-06-18 21:44:48 +02:00
2012-05-31 05:07:51 +02:00
2012-05-25 13:40:12 +02:00
2012-07-01 18:04:08 +02:00
2012-06-10 23:27:17 +02:00
2012-05-18 23:34:11 +02:00
2012-06-04 20:01:36 +02:00
2012-04-22 22:26:55 +02:00
2012-05-28 17:24:13 +02:00
2012-05-18 23:34:11 +02:00
2012-04-16 16:46:53 +02:00
2012-06-28 00:07:10 +02:00
2012-06-28 00:07:22 +02:00
2012-04-15 18:21:53 +02:00
2012-06-03 15:01:34 +02:00
2012-04-22 22:26:55 +02:00
2012-06-20 18:19:53 +02:00
2012-06-24 20:20:23 +02:00
2012-06-02 23:43:31 +02:00
2012-06-06 13:09:02 +02:00
2012-05-25 13:40:12 +02:00
2012-06-19 21:38:18 +02:00
2012-05-25 13:40:12 +02:00
2012-06-17 17:09:34 +02:00
2012-05-25 13:40:12 +02:00
2012-06-29 20:43:30 +02:00
2012-06-29 20:43:30 +02:00
2012-06-29 20:43:30 +02:00
2012-06-06 21:18:14 +02:00
2012-06-01 00:35:06 +02:00
2012-06-10 23:36:22 +02:00
2012-06-24 20:18:00 +02:00
2012-06-05 12:13:39 +02:00
2012-06-29 20:22:04 +02:00
2012-07-02 20:52:22 +02:00
2012-06-08 18:24:47 +02:00
2012-06-11 20:13:31 +02:00
2012-06-19 17:13:45 +02:00
2012-06-29 20:21:28 +02:00
2012-06-21 01:30:16 +00:00
2012-06-23 21:12:29 +02:00
2012-06-22 17:23:09 +02:00
2012-06-26 00:38:05 +02:00
2012-06-07 18:01:09 +02:00
2012-04-16 18:36:40 +02:00
2012-05-08 11:02:12 +02:00
2012-04-15 20:20:43 +02:00
2012-06-10 15:40:24 +02:00
2012-07-02 20:52:36 +02:00
2012-06-21 01:23:15 +00:00
2012-05-05 02:02:56 +02:00
2012-06-17 19:50:58 +02:00
2012-06-29 20:43:30 +02:00
2012-07-02 12:48:29 +02:00
2012-04-21 18:56:19 +01:00
2012-06-06 21:18:47 +02:00
2012-05-28 17:24:13 +02:00