Merge remote-tracking branch 'cehoyos/master'

[ffmpeg] / libavcodec / h264.h

diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index a76ee37343c5e1738501a07d84bfafc62fe036a8..2d363c9857a7db516d2ff901ca6f25753cae64ef 100644 (file)
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -363,7 +363,6 @@ typedef struct H264Context {
 
     int qscale;
     int droppable;
-    int data_partitioning;
     int coded_picture_number;
     int low_delay;
 
@@ -893,6 +892,13 @@ void ff_h264_reset_sei(H264Context *h);
  */
 const char* ff_h264_sei_stereo_mode(H264Context *h);
 
+#define COPY_PICTURE(dst, src) \
+do {\
+    *(dst) = *(src);\
+    (dst)->f.extended_data = (dst)->f.data;\
+    (dst)->tf.f = &(dst)->f;\
+} while (0)
+
 /*
  * o-o o-o
  *  / / /