Merge commit 'a871ef0cc936612bdb0e643196be72efcf0c8986'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 21:49:13 +0000 (23:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 21:49:13 +0000 (23:49 +0200)
* commit 'a871ef0cc936612bdb0e643196be72efcf0c8986':
  hwaccel: Rename priv_data_size to frame_priv_data_size

Conflicts:
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/avcodec.h
libavcodec/dxva2_h264.c
libavcodec/dxva2_mpeg2.c
libavcodec/dxva2_vc1.c
libavcodec/h264_slice.c
libavcodec/mpegvideo.c
libavcodec/vdpau_h264.c
libavcodec/vdpau_mpeg12.c
libavcodec/vdpau_mpeg4.c
libavcodec/vdpau_vc1.c

@@@ -3290,18 -2993,7 +3290,18 @@@ typedef struct AVHWAccel 
       * AVCodecContext.get_buffer() and deallocated after
       * AVCodecContext.release_buffer().
       */
-     int priv_data_size;
+     int frame_priv_data_size;
 +
 +    /**
 +     * Called for every Macroblock in a slice.
 +     *
 +     * XvMC uses it to replace the ff_MPV_decode_mb().
 +     * Instead of decoding to raw picture, MB parameters are
 +     * stored in an array provided by the video driver.
 +     *
 +     * @param s the mpeg context
 +     */
 +    void (*decode_mb)(struct MpegEncContext *s);
  } AVHWAccel;
  
  /**
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge