FFmpeg/libavcodec
Michael Niedermayer 564909093a Merge commit 'adadc3f2443d25b375e21e801516ccfd78e0b080'
* commit 'adadc3f2443d25b375e21e801516ccfd78e0b080':
  qdm2: refactor joined stereo support

Conflicts:
	libavcodec/qdm2.c

See: 2b12d1ffd841cf57976b124c1882e4a23a7c5f61

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 15:07:20 +02:00
..
2013-06-02 11:25:56 +02:00
2013-06-30 01:35:22 +02:00
2013-06-13 21:49:18 +00:00
2013-06-12 16:23:49 +02:00
2013-07-06 05:43:24 +00:00
2013-07-05 16:51:08 +00:00
2013-07-02 03:27:14 +02:00
2013-07-09 16:20:50 +02:00
2013-05-31 03:10:08 +02:00
2013-07-09 23:49:06 +02:00
2013-07-04 13:40:08 +02:00
2013-07-06 05:43:24 +00:00
2013-07-06 05:43:24 +00:00
2013-07-09 21:10:45 +02:00
2013-07-10 12:07:53 +00:00
2013-07-10 12:07:53 +00:00
2013-07-10 12:07:53 +00:00
2013-07-10 12:07:53 +00:00
2013-06-13 21:49:18 +00:00
2013-06-02 15:16:52 +00:00
2013-07-05 18:10:27 +00:00
2013-06-21 03:22:02 +02:00