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)
* 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>
1  2 
libavcodec/dxva2_h264.c
libavcodec/dxva2_mpeg2.c
libavcodec/dxva2_vc1.c
libavcodec/vaapi_h264.c
libavcodec/vda_h264.c

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -199,11 -196,12 +199,12 @@@ static int vda_sync_decode(struct vda_c
      return status;
  }
  
- static int start_frame(AVCodecContext *avctx,
-                        av_unused const uint8_t *buffer,
-                        av_unused uint32_t size)
+ static int vda_h264_start_frame(AVCodecContext *avctx,
+                                 av_unused const uint8_t *buffer,
+                                 av_unused uint32_t size)
  {
 -    struct vda_context *vda_ctx         = avctx->hwaccel_context;
 +    struct vda_context *vda_ctx = avctx->hwaccel_context;
  
      if (!vda_ctx->decoder)
          return -1;
      return 0;
  }
  
- static int decode_slice(AVCodecContext *avctx,
-                         const uint8_t *buffer,
-                         uint32_t size)
+ static int vda_h264_decode_slice(AVCodecContext *avctx,
+                                  const uint8_t *buffer,
+                                  uint32_t size)
  {
 -    struct vda_context *vda_ctx         = avctx->hwaccel_context;
 +    struct vda_context *vda_ctx = avctx->hwaccel_context;
      void *tmp;
  
      if (!vda_ctx->decoder)