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-06-24 02:09:53 +02:00
2012-07-02 21:19:41 +02:00
2012-06-26 23:57:07 +02:00
2012-06-26 23:57:07 +02:00
2012-06-28 17:18:37 +00:00
2012-06-27 01:58:09 +02:00
2012-06-24 02:09:53 +02:00
2012-06-26 23:57:07 +02:00
2012-06-26 23:57:07 +02:00
2012-06-26 23:57:07 +02:00
2012-06-26 23:57:07 +02:00
2012-06-26 23:57:07 +02:00
2012-06-26 23:57:07 +02:00
2012-06-26 23:57:07 +02:00
2012-06-26 23:57:07 +02:00
2012-06-16 15:15:16 +00:00
2012-06-26 19:09:15 +02:00
2012-06-26 23:57:07 +02:00
2012-06-26 13:15:14 +02:00
2012-06-26 23:57:07 +02:00
2012-06-26 23:57:07 +02:00
2012-05-18 23:34:11 +02:00
2012-06-24 02:09:53 +02:00
2012-06-13 22:43:57 +02:00
2012-05-06 16:18:10 +02:00
2012-06-26 23:57:07 +02:00
2012-06-27 01:58:09 +02:00
2012-06-30 14:03:54 +02:00
2012-06-30 14:03:54 +02:00
2012-06-25 13:42:47 +02:00
2012-06-25 13:42:47 +02:00
2012-06-24 02:09:53 +02:00
2012-06-30 14:03:54 +02:00
2012-06-30 14:03:54 +02:00
2012-06-27 01:58:09 +02:00
2012-06-27 00:34:36 +02:00
2012-03-22 13:40:37 +01:00
2012-03-17 11:21:49 +01:00
2012-06-13 10:51:33 +02:00
2012-05-31 17:27:27 +02:00
2012-06-24 02:09:53 +02:00
2012-06-30 14:03:54 +02:00
2012-06-28 22:27:05 +02:00
2012-06-28 22:27:05 +02:00
2012-06-26 11:40:21 +02:00
2012-06-16 15:15:16 +00:00
2012-04-04 16:16:09 +02:00
2012-06-27 01:58:09 +02:00
2012-06-27 00:34:36 +02:00
2012-06-29 11:26:18 +02:00
2012-07-02 21:19:41 +02:00
2012-06-25 13:42:37 +02:00
2012-06-27 00:34:36 +02:00
2012-06-24 02:09:53 +02:00
2012-05-26 20:45:59 +02:00
2012-04-07 13:57:39 +02:00
2012-05-25 18:54:01 +02:00
2012-05-26 20:46:00 +02:00
2012-04-07 13:57:39 +02:00
2012-06-27 00:34:36 +02:00
2012-06-30 14:03:54 +02:00
2012-06-26 23:57:07 +02:00
2012-05-19 10:59:52 +02:00
2012-06-27 01:58:09 +02:00
2012-06-20 23:55:17 +02:00
2012-05-18 23:34:11 +02:00
2012-06-28 22:27:05 +02:00
2012-06-27 01:58:09 +02:00
2012-06-29 11:28:34 +02:00
2012-06-26 23:57:07 +02:00
2012-06-26 23:57:07 +02:00
2012-06-27 01:58:09 +02:00
2012-06-26 23:57:07 +02:00
2012-06-26 23:57:07 +02:00
2012-06-13 22:43:57 +02:00
2012-06-27 01:58:09 +02:00
2012-06-27 01:58:09 +02:00
2012-06-26 23:57:07 +02:00
2012-06-26 23:57:07 +02:00
2012-06-27 01:58:09 +02:00
2012-06-26 23:57:07 +02:00
2012-06-27 01:58:09 +02:00
2012-06-27 01:58:09 +02:00
2012-06-26 23:57:07 +02:00
2012-06-26 23:57:07 +02:00
2012-06-27 01:58:09 +02:00
2012-07-02 21:19:41 +02:00
2012-06-16 15:15:16 +00:00
2012-06-27 01:58:09 +02:00
2012-06-26 23:57:07 +02:00
2012-06-27 01:58:09 +02:00
2012-06-26 23:57:07 +02:00
2012-06-26 23:57:07 +02:00
2012-06-13 22:43:57 +02:00
2012-06-27 01:58:09 +02:00
2012-06-27 01:58:09 +02:00
2012-06-13 22:43:57 +02:00
2012-06-26 23:57:07 +02:00
2012-06-26 23:57:07 +02:00
2012-06-26 23:57:07 +02:00
2012-06-26 23:57:07 +02:00
2012-06-27 01:58:09 +02:00
2012-06-27 01:58:09 +02:00
2012-06-26 23:57:07 +02:00
2012-06-26 23:57:07 +02:00
2012-06-16 15:15:16 +00:00
2012-06-16 15:15:16 +00:00
2012-06-24 02:09:53 +02:00
2012-06-24 02:09:53 +02:00
2012-06-24 02:09:53 +02:00
2012-06-27 01:58:09 +02:00
2012-06-27 01:58:09 +02:00
2012-06-20 20:14:01 +02:00
2012-07-02 21:19:41 +02:00
2012-06-27 00:34:36 +02:00
2012-06-13 22:43:57 +02:00
2012-06-13 22:43:57 +02:00
2012-06-26 13:15:26 +02:00
2012-06-22 23:11:43 +02:00
2012-06-27 01:58:09 +02:00
2012-06-22 23:11:43 +02:00
2012-06-22 23:11:43 +02:00
2012-06-22 23:11:43 +02:00
2012-06-26 23:57:07 +02:00
2012-07-02 21:19:41 +02:00
b286383bd2