ffmpeg/libavcodec
Michael Niedermayer 9f890a1656 Merge commit '2e09096da912f563c4dd889a8f25c314529bbaa6'
* commit '2e09096da912f563c4dd889a8f25c314529bbaa6':
  kgv1: use the AVFrame API properly.
  indeo2: use the AVFrame API properly.
  iff: use the AVFrame API properly.
  msrle: use the AVFrame API properly.

Conflicts:
	libavcodec/iff.c
	libavcodec/indeo2.c
	libavcodec/kgv1dec.c
	libavcodec/msrle.c

See: 451b2ca1b4349f9b60416cc057eaf5518d81025c
See: 80e9e63c946660304fc65fa8141ccfdbe4d196d1
See: 057dce5f21cd70db1ef6e3b67644a39f0d51aba5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-17 01:38:41 +01:00
..
2013-10-23 14:32:04 +02:00
2013-10-30 11:04:06 +00:00
2013-10-28 08:33:21 -04:00
2013-05-10 16:10:51 -03:00
2013-11-15 10:16:28 +01:00
2013-10-30 11:04:06 +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-10-30 23:56:52 +01:00
2013-10-31 20:19:59 +01:00
2013-09-25 16:30:25 +02:00
2013-11-16 12:48:25 +01:00
2013-10-15 17:00:28 +01: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-08-13 15:45:08 +02:00
2013-10-15 23:58:20 +02:00
2013-10-18 16:46:08 +02:00
2013-04-20 00:05:35 +02:00
2013-10-15 22:13:02 +02:00
2013-10-13 21:48:28 +02:00
2013-10-28 23:54:28 +01:00
2013-08-07 21:13:12 +02:00
2013-08-12 19:40:29 +02:00
2013-11-15 10:16:28 +01:00
2013-10-30 12:41:43 +00:00
2013-09-21 16:59:13 +02:00
2013-08-26 19:26:01 +00:00
2013-11-05 13:19:30 +00:00
2013-11-05 13:19:30 +00:00
2013-07-28 22:27:36 +00:00
2013-11-16 12:49:18 +01:00
2013-08-09 23:02:48 +02:00
2013-10-28 23:54:28 +01: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-10-22 19:55:47 +02:00
2013-11-05 12:44:20 +00:00
2013-05-28 13:56:29 +03:00
2013-04-15 12:32:05 +03:00
2013-11-15 10:16:28 +01:00
2013-11-15 10:16:28 +01:00
2013-11-15 10:16:28 +01:00
2013-10-30 11:04:06 +00:00