ffmpeg/libavcodec
Michael Niedermayer 43dec5ef9a Merge remote-tracking branch 'qatar/master'
* qatar/master:
  indeo4: Check the inherited quant_mat

Conflicts:
	libavcodec/indeo4.c

See: 884efd4e09696b201457feebdef684aee30be99d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 10:38:51 +02:00
..
2013-05-10 16:10:51 -03:00
2013-10-06 20:12:37 +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-09-25 16:30:25 +02:00
2013-04-25 14:21:00 +00: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-09-30 14:34:12 +02:00
2013-04-20 00:05:35 +02:00
2013-08-07 21:13:12 +02:00
2013-08-12 19:40:29 +02:00
2013-10-06 20:12:37 +00:00
2013-09-21 16:59:13 +02:00
2013-08-26 19:26:01 +00:00
2013-07-28 22:27:36 +00:00
2013-08-09 23:02:48 +02:00
2013-09-21 16:59:13 +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-08-13 19:29:10 +00:00
2013-10-03 16:33:09 +02:00
2013-05-28 13:56:29 +03:00
2013-10-06 20:12:37 +00:00
2013-04-15 12:32:05 +03:00
2013-10-02 21:03:11 -04:00
2013-10-02 21:03:15 -04:00