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-05-11 20:06:45 +02:00
2014-05-07 23:39:47 +02:00
2014-05-07 23:39:47 +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-05-07 23:39:47 +02:00
2014-05-04 13:24:40 +02:00
2014-05-09 16:07:15 +02:00
2014-05-03 18:25:17 +02:00