Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Mar 2013 09:34:14 +0000 (10:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Mar 2013 09:34:14 +0000 (10:34 +0100)
commitbaf10ad186edb9da522e44c332372d52a5c6b336
tree8d53b708f59c4ea0235cf034b59d89863ebd69e0
parent28adecf0fa1fa56db17b1f0e7711acb68baf00e7
parentc57a593670308447aa1998259a1912273cc67fe9
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hwaccel: consistent name prefixes for start_frame/end_frame/decode_slice

Conflicts:
libavcodec/vda_h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dxva2_h264.c
libavcodec/dxva2_mpeg2.c
libavcodec/dxva2_vc1.c
libavcodec/vaapi_h264.c
libavcodec/vda_h264.c