FFmpeg/libavcodec
Michael Niedermayer bfb1f44d24 Merge commit 'a639ea7f4bc44bf6bfa452675558a342924a66a9'
* commit 'a639ea7f4bc44bf6bfa452675558a342924a66a9':
  escape124: use the AVFrame API properly.
  qtrle: use the AVFrame API properly.
  cljr: use the AVFrame API properly.
  cinepak: use the AVFrame API properly.

Conflicts:
	libavcodec/cinepak.c
	libavcodec/cljr.c
	libavcodec/qtrle.c

See: 80e9e63c libavcodec/cinepak.c
See: 71c378984b0bd5470f67c424a79a4750f84d2d3e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-17 00:51:01 +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-11-15 10:16:28 +01:00
2013-10-30 11:04:06 +00:00
2013-10-03 23:00:09 +02:00
2013-10-30 23:56:52 +01:00
2013-10-31 20:19:59 +01:00
2013-11-16 12:48:25 +01:00
2013-10-15 17:00:28 +01:00
2013-10-06 20:12:37 +00:00
2013-10-08 12:40:33 +00:00
2013-10-15 23:58:20 +02:00
2013-10-18 16:46:08 +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-11-15 10:16:28 +01:00
2013-10-30 12:41:43 +00:00
2013-11-05 13:19:30 +00:00
2013-11-05 13:19:30 +00:00
2013-11-16 12:49:18 +01:00
2013-10-28 23:54:28 +01:00
2013-10-22 19:55:47 +02:00
2013-11-05 12:44:20 +00: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