FFmpeg/libavformat
Michael Niedermayer 2b7c0c9fe1 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  mp3dec: perform I/S and M/S only when frame mode is joint stereo.
  id3v2: add another mimetype for JPEG image
  lzw: prevent buffer overreads.
  WMAL: Remove inaccurate and unnecessary doxy
  h264: fix cabac-on-stack after safe cabac reader.
  truemotion2: convert packet header reading to bytestream2.

Conflicts:
	libavcodec/lzw.c
	libavcodec/truemotion2.c
	libavformat/id3v2.c

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