Merge commit '7948a51b5c3d08e1a1173442a7ff72b220def303'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Mar 2014 21:38:11 +0000 (22:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Mar 2014 21:39:54 +0000 (22:39 +0100)
* commit '7948a51b5c3d08e1a1173442a7ff72b220def303':
  vdpau: don't assume Picture and H264Picture are the same

Conflicts:
libavcodec/vdpau.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/vdpau.c
libavcodec/vdpau_h264.c
libavcodec/vdpau_internal.h
libavcodec/vdpau_mpeg12.c
libavcodec/vdpau_mpeg4.c
libavcodec/vdpau_vc1.c

   * @{
   */
  
- int ff_vdpau_common_start_frame(Picture *pic,
 +AVVDPAUContext *av_alloc_vdpaucontext(void)
 +{
 +    return av_vdpau_alloc_context();
 +}
 +
 +MAKE_ACCESSORS(AVVDPAUContext, vdpau_hwaccel, AVVDPAU_Render2, render2)
 +
+ int ff_vdpau_common_start_frame(struct vdpau_picture_context *pic_ctx,
                                  av_unused const uint8_t *buffer,
                                  av_unused uint32_t size)
  {
Simple merge
@@@ -75,28 -69,11 +75,29 @@@ struct vdpau_picture_context 
       */
      VdpBitstreamBuffer *bitstream_buffers;
  };
 +#endif
  
- int ff_vdpau_common_start_frame(Picture *pic,
+ int ff_vdpau_common_start_frame(struct vdpau_picture_context *pic,
                                  const uint8_t *buffer, uint32_t size);
  int ff_vdpau_mpeg_end_frame(AVCodecContext *avctx);
- int ff_vdpau_add_buffer(Picture *pic, const uint8_t *buf, uint32_t buf_size);
+ int ff_vdpau_add_buffer(struct vdpau_picture_context *pic, const uint8_t *buf,
+                         uint32_t buf_size);
  
 +
 +void ff_vdpau_add_data_chunk(uint8_t *data, const uint8_t *buf,
 +                             int buf_size);
 +
 +void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf,
 +                                    int buf_size, int slice_count);
 +
 +void ff_vdpau_h264_picture_start(H264Context *h);
 +void ff_vdpau_h264_set_reference_frames(H264Context *h);
 +void ff_vdpau_h264_picture_complete(H264Context *h);
 +
 +void ff_vdpau_vc1_decode_picture(MpegEncContext *s, const uint8_t *buf,
 +                                 int buf_size);
 +
 +void ff_vdpau_mpeg4_decode_picture(Mpeg4DecContext *s, const uint8_t *buf,
 +                                   int buf_size);
 +
  #endif /* AVCODEC_VDPAU_INTERNAL_H */
Simple merge
Simple merge
Simple merge