Merge commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 18:35:37 +0000 (19:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 18:35:37 +0000 (19:35 +0100)
* commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327':
  lavc: move AVFrame.hwaccel_picture_private to Picture.

Conflicts:
libavcodec/avcodec.h
libavcodec/mpegvideo.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/mpegvideo.c
libavcodec/mpegvideo.h
libavutil/version.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -145,7 -143,10 +145,11 @@@ typedef struct Picture
      int b_frame_score;          /* */
      void *owner2;               ///< pointer to the context that allocated this picture
      int needs_realloc;          ///< Picture needs to be reallocated (eg due to a frame size change)
 +    int period_since_free;      ///< "cycles" since this Picture has been freed
+     /**
+      * hardware accelerator private data
+      */
+     void *hwaccel_picture_private;
  } Picture;
  
  /**
Simple merge