FFmpeg/libavcodec
Michael Niedermayer 2ec4586d77 Merge commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8'
* commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8':
  lavc: Add hwaccel private data and init/uninit callbacks

Conflicts:
	libavcodec/avcodec.h
	libavcodec/internal.h
	libavcodec/pthread_frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-12 00:21:44 +02:00
..
2014-04-22 20:44:31 +02:00
2014-04-22 02:38:03 +02:00
2014-04-22 20:08:30 +02:00
2014-05-11 20:06:45 +02:00
2014-04-22 20:44:31 +02:00
2014-04-22 20:44:31 +02:00
2014-04-25 23:40:59 +02:00
2014-04-22 20:08:30 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-04-12 05:40:37 +02:00
2014-04-20 17:02:16 +02:00
2014-04-05 03:32:11 +02:00
2014-04-22 20:44:31 +02:00
2014-04-12 15:41:00 +02:00
2014-05-07 23:39:47 +02:00
2014-04-27 14:50:14 +02:00
2014-05-07 23:39:47 +02:00
2014-04-28 00:22:38 +02:00
2014-04-04 04:00:11 +02:00
2014-05-09 13:34:12 +02:00
2014-05-06 18:23:36 +02:00
2014-05-06 18:23:36 +02:00
2014-03-31 01:11:16 +02:00
2014-05-07 23:39:47 +02:00
2014-04-01 13:43:44 +02:00
2014-05-04 13:24:40 +02:00
2014-05-09 16:07:15 +02:00
2014-04-22 20:44:31 +02:00
2014-04-27 13:03:28 +02:00
2014-04-30 17:41:31 +02:00
2014-04-18 15:19:09 +02:00
2014-04-25 15:04:42 +02:00
2014-04-16 19:45:43 +02:00
2014-05-03 18:25:17 +02:00
2014-03-29 18:13:15 +01:00
2014-04-20 17:35:19 +02:00
2014-04-22 02:41:05 +02:00
2014-03-27 23:57:51 +01:00