FFmpeg/libavcodec
Michael Niedermayer 1ec295a5c5 Merge commit '1b1094a19d9e41baf3253c83841f9e5343cecbd0'
* commit '1b1094a19d9e41baf3253c83841f9e5343cecbd0':
  vdpau: switch ff_vdpau_get_surface_id from Picture to AVFrame

Conflicts:
	libavcodec/vdpau_internal.h
	libavcodec/vdpau_vc1.c

See: 2a37e560dccb81328f610c51e74ce6cc53f1a5c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 22:48:58 +01:00
..
2014-02-17 20:50:33 +01:00
2014-02-16 21:13:02 +01:00
2014-02-18 18:11:23 +01:00
2014-03-16 23:31:30 +01:00
2014-03-19 22:24:32 +01:00
2014-02-21 16:57:26 -03:00
2014-02-21 16:57:26 -03:00
2014-03-16 23:29:51 +01:00
2014-03-16 23:31:29 +01:00