@@ -8,6 +8,7 @@ version next:

 version 0.8:

+

 - many many things we forgot because we rather write code than changelogs

 - WebM support in Matroska de/muxer

 - low overhead Ogg muxing

@@ -57,10 +58,10 @@ version 0.8:

 - demuxer for receiving raw rtp:// URLs without an SDP description

 - single stream LATM/LOAS decoder

 - setpts filter added

-- Win64 support for optimized asm functions

+- Win64 support for optimized x86 assembly functions

 - MJPEG/AVI1 to JPEG/JFIF bitstream filter

 - ASS subtitle encoder and decoder

-- IEC 61937 encapsulation for E-AC3, TrueHD, DTS-HD (for HDMI passthrough)

+- IEC 61937 encapsulation for E-AC-3, TrueHD, DTS-HD (for HDMI passthrough)

 - overlay filter added

 - rename aspect filter to setdar, and pixelaspect to setsar

 - IEC 61937 demuxer

@@ -8,6 +8,7 @@ vpath %.asm  $(SRC_PATH)

 vpath %.v    $(SRC_PATH)

 vpath %.texi $(SRC_PATH)

+

 PROGS-$(CONFIG_FFMPEG)   += ffmpeg

 PROGS-$(CONFIG_FFPLAY)   += ffplay

 PROGS-$(CONFIG_FFPROBE)  += ffprobe

@@ -43,11 +44,10 @@ SKIPHEADERS = cmdutils_common_opts.h

 include $(SRC_PATH)/common.mak

-FF_LDFLAGS   := $(FFLDFLAGS)

 FF_EXTRALIBS := $(FFEXTRALIBS)

 FF_DEP_LIBS  := $(DEP_LIBS)

-all: $(FF_DEP_LIBS) $(PROGS)

+all: $(PROGS)

 $(PROGS): %$(EXESUF): %_g$(EXESUF)

 	$(CP) $< $@

@@ -83,10 +83,10 @@ $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))

 ffplay.o: CFLAGS += $(SDL_CFLAGS)

 ffplay_g$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)

-ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)

+ffserver_g$(EXESUF): LDFLAGS += $(FFSERVERLDFLAGS)

 %_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)

-	$(LD) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)

+	$(LD) $(LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)

 OBJDIRS += tools

@@ -27,6 +27,7 @@ CFLAGS     += $(ECFLAGS)

 CCFLAGS     = $(CFLAGS)

 YASMFLAGS  += $(IFLAGS) -Pconfig.asm

 HOSTCFLAGS += $(IFLAGS)

+LDFLAGS    += $(ALLFFLIBS:%=-Llib%)

 define COMPILE

        $($(1)DEP)

@@ -69,7 +70,6 @@ FFLIBS    := $(FFLIBS-yes) $(FFLIBS)

 TESTPROGS += $(TESTPROGS-yes)

 FFEXTRALIBS := $(FFLIBS:%=-l%$(BUILDSUF)) $(EXTRALIBS)

-FFLDFLAGS   := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS)

 EXAMPLES  := $(EXAMPLES:%=$(SUBDIR)%-example$(EXESUF))

 OBJS      := $(sort $(OBJS:%=$(SUBDIR)%))

@@ -54,10 +54,8 @@ These features are supported by all compilers we care about, so we will not

 accept patches to remove their use unless they absolutely do not impair

 clarity and performance.

-All code must compile with GCC 3.3. Currently, FFmpeg also

-compiles with several other compilers, such as the Compaq ccc compiler

-or Sun Studio 9, and we would like to keep it that way unless it would

-be exceedingly involved. To ensure compatibility, please do not use any

+All code must compile with recent versions of GCC and a number of other

+currently supported compilers. To ensure compatibility, please do not use

 additional C99 features or GCC extensions. Especially watch out for:

 @itemize @bullet

 @item

@@ -750,304 +750,6 @@ typedef struct AVPanScan{

     int16_t position[3][2];

 }AVPanScan;

-#define FF_COMMON_FRAME \

-    /**\

-     * pointer to the picture planes.\

-     * This might be different from the first allocated byte\

-     * - encoding: \

-     * - decoding: \

-     */\

-    uint8_t *data[4];\

-    int linesize[4];\

-    /**\

-     * pointer to the first allocated byte of the picture. Can be used in get_buffer/release_buffer.\

-     * This isn't used by libavcodec unless the default get/release_buffer() is used.\

-     * - encoding: \

-     * - decoding: \

-     */\

-    uint8_t *base[4];\

-    /**\

-     * 1 -> keyframe, 0-> not\

-     * - encoding: Set by libavcodec.\

-     * - decoding: Set by libavcodec.\

-     */\

-    int key_frame;\

-\

-    /**\

-     * Picture type of the frame, see ?_TYPE below.\

-     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).\

-     * - decoding: Set by libavcodec.\

-     */\

-    enum AVPictureType pict_type;\

-\

-    /**\

-     * presentation timestamp in time_base units (time when frame should be shown to user)\

-     * If AV_NOPTS_VALUE then frame_rate = 1/time_base will be assumed.\

-     * - encoding: MUST be set by user.\

-     * - decoding: Set by libavcodec.\

-     */\

-    int64_t pts;\

-\

-    /**\

-     * picture number in bitstream order\

-     * - encoding: set by\

-     * - decoding: Set by libavcodec.\

-     */\

-    int coded_picture_number;\

-    /**\

-     * picture number in display order\

-     * - encoding: set by\

-     * - decoding: Set by libavcodec.\

-     */\

-    int display_picture_number;\

-\

-    /**\

-     * quality (between 1 (good) and FF_LAMBDA_MAX (bad)) \

-     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).\

-     * - decoding: Set by libavcodec.\

-     */\

-    int quality; \

-\

-    /**\

-     * buffer age (1->was last buffer and dint change, 2->..., ...).\

-     * Set to INT_MAX if the buffer has not been used yet.\

-     * - encoding: unused\

-     * - decoding: MUST be set by get_buffer().\

-     */\

-    int age;\

-\

-    /**\

-     * is this picture used as reference\

-     * The values for this are the same as the MpegEncContext.picture_structure\

-     * variable, that is 1->top field, 2->bottom field, 3->frame/both fields.\

-     * Set to 4 for delayed, non-reference frames.\

-     * - encoding: unused\

-     * - decoding: Set by libavcodec. (before get_buffer() call)).\

-     */\

-    int reference;\

-\

-    /**\

-     * QP table\

-     * - encoding: unused\

-     * - decoding: Set by libavcodec.\

-     */\

-    int8_t *qscale_table;\

-    /**\

-     * QP store stride\

-     * - encoding: unused\

-     * - decoding: Set by libavcodec.\

-     */\

-    int qstride;\

-\

-    /**\

-     * mbskip_table[mb]>=1 if MB didn't change\

-     * stride= mb_width = (width+15)>>4\

-     * - encoding: unused\

-     * - decoding: Set by libavcodec.\

-     */\

-    uint8_t *mbskip_table;\

-\

-    /**\

-     * motion vector table\

-     * @code\

-     * example:\

-     * int mv_sample_log2= 4 - motion_subsample_log2;\

-     * int mb_width= (width+15)>>4;\

-     * int mv_stride= (mb_width << mv_sample_log2) + 1;\

-     * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];\

-     * @endcode\

-     * - encoding: Set by user.\

-     * - decoding: Set by libavcodec.\

-     */\

-    int16_t (*motion_val[2])[2];\

-\

-    /**\

-     * macroblock type table\

-     * mb_type_base + mb_width + 2\

-     * - encoding: Set by user.\

-     * - decoding: Set by libavcodec.\

-     */\

-    uint32_t *mb_type;\

-\

-    /**\

-     * log2 of the size of the block which a single vector in motion_val represents: \

-     * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)\

-     * - encoding: unused\

-     * - decoding: Set by libavcodec.\

-     */\

-    uint8_t motion_subsample_log2;\

-\

-    /**\

-     * for some private data of the user\

-     * - encoding: unused\

-     * - decoding: Set by user.\

-     */\

-    void *opaque;\

-\

-    /**\

-     * error\

-     * - encoding: Set by libavcodec. if flags&CODEC_FLAG_PSNR.\

-     * - decoding: unused\

-     */\

-    uint64_t error[4];\

-\

-    /**\

-     * type of the buffer (to keep track of who has to deallocate data[*])\

-     * - encoding: Set by the one who allocates it.\

-     * - decoding: Set by the one who allocates it.\

-     * Note: User allocated (direct rendering) & internal buffers cannot coexist currently.\

-     */\

-    int type;\

-    \

-    /**\

-     * When decoding, this signals how much the picture must be delayed.\

-     * extra_delay = repeat_pict / (2*fps)\

-     * - encoding: unused\

-     * - decoding: Set by libavcodec.\

-     */\

-    int repeat_pict;\

-    \

-    /**\

-     * \

-     */\

-    int qscale_type;\

-    \

-    /**\

-     * The content of the picture is interlaced.\

-     * - encoding: Set by user.\

-     * - decoding: Set by libavcodec. (default 0)\

-     */\

-    int interlaced_frame;\

-    \

-    /**\

-     * If the content is interlaced, is top field displayed first.\

-     * - encoding: Set by user.\

-     * - decoding: Set by libavcodec.\

-     */\

-    int top_field_first;\

-    \

-    /**\

-     * Pan scan.\

-     * - encoding: Set by user.\

-     * - decoding: Set by libavcodec.\

-     */\

-    AVPanScan *pan_scan;\

-    \

-    /**\

-     * Tell user application that palette has changed from previous frame.\

-     * - encoding: ??? (no palette-enabled encoder yet)\

-     * - decoding: Set by libavcodec. (default 0).\

-     */\

-    int palette_has_changed;\

-    \

-    /**\

-     * codec suggestion on buffer type if != 0\

-     * - encoding: unused\

-     * - decoding: Set by libavcodec. (before get_buffer() call)).\

-     */\

-    int buffer_hints;\

-\

-    /**\

-     * DCT coefficients\

-     * - encoding: unused\

-     * - decoding: Set by libavcodec.\

-     */\

-    short *dct_coeff;\

-\

-    /**\

-     * motion reference frame index\

-     * the order in which these are stored can depend on the codec.\

-     * - encoding: Set by user.\

-     * - decoding: Set by libavcodec.\

-     */\

-    int8_t *ref_index[2];\

-\

-    /**\

-     * reordered opaque 64bit (generally an integer or a double precision float\

-     * PTS but can be anything). \

-     * The user sets AVCodecContext.reordered_opaque to represent the input at\

-     * that time,\

-     * the decoder reorders values as needed and sets AVFrame.reordered_opaque\

-     * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque \

-     * @deprecated in favor of pkt_pts\

-     * - encoding: unused\

-     * - decoding: Read by user.\

-     */\

-    int64_t reordered_opaque;\

-\

-    /**\

-     * hardware accelerator private data (FFmpeg allocated)\

-     * - encoding: unused\

-     * - decoding: Set by libavcodec\

-     */\

-    void *hwaccel_picture_private;\

-\

-    /**\

-     * reordered pts from the last AVPacket that has been input into the decoder\

-     * - encoding: unused\

-     * - decoding: Read by user.\

-     */\

-    int64_t pkt_pts;\

-\

-    /**\

-     * dts from the last AVPacket that has been input into the decoder\

-     * - encoding: unused\

-     * - decoding: Read by user.\

-     */\

-    int64_t pkt_dts;\

-\

-    /**\

-     * the AVCodecContext which ff_thread_get_buffer() was last called on\

-     * - encoding: Set by libavcodec.\

-     * - decoding: Set by libavcodec.\

-     */\

-    struct AVCodecContext *owner;\

-\

-    /**\

-     * used by multithreading to store frame-specific info\

-     * - encoding: Set by libavcodec.\

-     * - decoding: Set by libavcodec.\

-     */\

-    void *thread_opaque;\

-\

-    /**\

-     * frame timestamp estimated using various heuristics, in stream time base\

-     * - encoding: unused\

-     * - decoding: set by libavcodec, read by user.\

-     */\

-    int64_t best_effort_timestamp;\

-\

-    /**\

-     * reordered pos from the last AVPacket that has been input into the decoder\

-     * - encoding: unused\

-     * - decoding: Read by user.\

-     */\

-    int64_t pkt_pos;\

-\

-    /**\

-     * reordered sample aspect ratio for the video frame, 0/1 if unknown\unspecified

-     * - encoding: unused\

-     * - decoding: Read by user.\

-     */\

-    AVRational sample_aspect_ratio;\

-\

-    /**\

-     * width and height of the video frame\

-     * - encoding: unused\

-     * - decoding: Read by user.\

-     */\

-    int width, height;\

-\

-    /**\

-     * format of the frame, -1 if unknown or unset\

-     * It should be cast to the corresponding enum (enum PixelFormat\

-     * for video, enum AVSampleFormat for audio)\

-     * - encoding: unused\

-     * - decoding: Read by user.\

-     */\

-    int format;\

-

-

 #define FF_QSCALE_TYPE_MPEG1 0

 #define FF_QSCALE_TYPE_MPEG2 1

 #define FF_QSCALE_TYPE_H264  2

@@ -1142,15 +844,308 @@ typedef struct AVPacket {

 /**

  * Audio Video Frame.

- * New fields can be added to the end of FF_COMMON_FRAME with minor version

- * bumps.

- * Removal, reordering and changes to existing fields require a major

- * version bump. No fields should be added into AVFrame before or after

- * FF_COMMON_FRAME!

+ * New fields can be added to the end of AVFRAME with minor version

+ * bumps. Removal, reordering and changes to existing fields require

+ * a major version bump.

  * sizeof(AVFrame) must not be used outside libav*.

  */

 typedef struct AVFrame {

-    FF_COMMON_FRAME

+    /**

+     * pointer to the picture planes.

+     * This might be different from the first allocated byte

+     * - encoding:

+     * - decoding:

+     */

+    uint8_t *data[4];

+    int linesize[4];

+    /**

+     * pointer to the first allocated byte of the picture. Can be used in get_buffer/release_buffer.

+     * This isn't used by libavcodec unless the default get/release_buffer() is used.

+     * - encoding:

+     * - decoding:

+     */

+    uint8_t *base[4];

+    /**

+     * 1 -> keyframe, 0-> not

+     * - encoding: Set by libavcodec.

+     * - decoding: Set by libavcodec.

+     */

+    int key_frame;

+

+    /**

+     * Picture type of the frame, see ?_TYPE below.

+     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).

+     * - decoding: Set by libavcodec.

+     */

+    enum AVPictureType pict_type;

+

+    /**

+     * presentation timestamp in time_base units (time when frame should be shown to user)

+     * If AV_NOPTS_VALUE then frame_rate = 1/time_base will be assumed.

+     * - encoding: MUST be set by user.

+     * - decoding: Set by libavcodec.

+     */

+    int64_t pts;

+

+    /**

+     * picture number in bitstream order

+     * - encoding: set by

+     * - decoding: Set by libavcodec.

+     */

+    int coded_picture_number;

+    /**

+     * picture number in display order

+     * - encoding: set by

+     * - decoding: Set by libavcodec.

+     */

+    int display_picture_number;

+

+    /**

+     * quality (between 1 (good) and FF_LAMBDA_MAX (bad))

+     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).

+     * - decoding: Set by libavcodec.

+     */

+    int quality;

+

+    /**

+     * buffer age (1->was last buffer and dint change, 2->..., ...).

+     * Set to INT_MAX if the buffer has not been used yet.

+     * - encoding: unused

+     * - decoding: MUST be set by get_buffer().

+     */

+    int age;

+

+    /**

+     * is this picture used as reference

+     * The values for this are the same as the MpegEncContext.picture_structure

+     * variable, that is 1->top field, 2->bottom field, 3->frame/both fields.

+     * Set to 4 for delayed, non-reference frames.

+     * - encoding: unused

+     * - decoding: Set by libavcodec. (before get_buffer() call)).

+     */

+    int reference;

+

+    /**

+     * QP table

+     * - encoding: unused

+     * - decoding: Set by libavcodec.

+     */

+    int8_t *qscale_table;

+    /**

+     * QP store stride

+     * - encoding: unused

+     * - decoding: Set by libavcodec.

+     */

+    int qstride;

+

+    /**

+     * mbskip_table[mb]>=1 if MB didn't change

+     * stride= mb_width = (width+15)>>4

+     * - encoding: unused

+     * - decoding: Set by libavcodec.

+     */

+    uint8_t *mbskip_table;

+

+    /**

+     * motion vector table

+     * @code

+     * example:

+     * int mv_sample_log2= 4 - motion_subsample_log2;

+     * int mb_width= (width+15)>>4;

+     * int mv_stride= (mb_width << mv_sample_log2) + 1;

+     * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];

+     * @endcode

+     * - encoding: Set by user.

+     * - decoding: Set by libavcodec.

+     */

+    int16_t (*motion_val[2])[2];

+

+    /**

+     * macroblock type table

+     * mb_type_base + mb_width + 2

+     * - encoding: Set by user.

+     * - decoding: Set by libavcodec.

+     */

+    uint32_t *mb_type;

+

+    /**

+     * log2 of the size of the block which a single vector in motion_val represents:

+     * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)

+     * - encoding: unused

+     * - decoding: Set by libavcodec.

+     */

+    uint8_t motion_subsample_log2;

+

+    /**

+     * for some private data of the user

+     * - encoding: unused

+     * - decoding: Set by user.

+     */

+    void *opaque;

+

+    /**

+     * error

+     * - encoding: Set by libavcodec. if flags&CODEC_FLAG_PSNR.

+     * - decoding: unused

+     */

+    uint64_t error[4];

+

+    /**

+     * type of the buffer (to keep track of who has to deallocate data[*])

+     * - encoding: Set by the one who allocates it.

+     * - decoding: Set by the one who allocates it.

+     * Note: User allocated (direct rendering) & internal buffers cannot coexist currently.

+     */

+    int type;

+

+    /**

+     * When decoding, this signals how much the picture must be delayed.

+     * extra_delay = repeat_pict / (2*fps)

+     * - encoding: unused

+     * - decoding: Set by libavcodec.

+     */

+    int repeat_pict;

+

+    /**

+     *

+     */

+    int qscale_type;

+

+    /**

+     * The content of the picture is interlaced.

+     * - encoding: Set by user.

+     * - decoding: Set by libavcodec. (default 0)

+     */

+    int interlaced_frame;

+

+    /**

+     * If the content is interlaced, is top field displayed first.

+     * - encoding: Set by user.

+     * - decoding: Set by libavcodec.

+     */

+    int top_field_first;

+

+    /**

+     * Pan scan.

+     * - encoding: Set by user.

+     * - decoding: Set by libavcodec.

+     */

+    AVPanScan *pan_scan;

+

+    /**

+     * Tell user application that palette has changed from previous frame.

+     * - encoding: ??? (no palette-enabled encoder yet)

+     * - decoding: Set by libavcodec. (default 0).

+     */

+    int palette_has_changed;

+

+    /**

+     * codec suggestion on buffer type if != 0

+     * - encoding: unused

+     * - decoding: Set by libavcodec. (before get_buffer() call)).

+     */

+    int buffer_hints;

+

+    /**

+     * DCT coefficients

+     * - encoding: unused

+     * - decoding: Set by libavcodec.

+     */

+    short *dct_coeff;

+

+    /**

+     * motion reference frame index

+     * the order in which these are stored can depend on the codec.

+     * - encoding: Set by user.

+     * - decoding: Set by libavcodec.

+     */

+    int8_t *ref_index[2];

+

+    /**

+     * reordered opaque 64bit (generally an integer or a double precision float

+     * PTS but can be anything).

+     * The user sets AVCodecContext.reordered_opaque to represent the input at

+     * that time,

+     * the decoder reorders values as needed and sets AVFrame.reordered_opaque

+     * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque

+     * @deprecated in favor of pkt_pts

+     * - encoding: unused

+     * - decoding: Read by user.

+     */

+    int64_t reordered_opaque;

+

+    /**

+     * hardware accelerator private data (FFmpeg-allocated)

+     * - encoding: unused

+     * - decoding: Set by libavcodec

+     */

+    void *hwaccel_picture_private;

+

+    /**

+     * reordered pts from the last AVPacket that has been input into the decoder

+     * - encoding: unused

+     * - decoding: Read by user.

+     */

+    int64_t pkt_pts;

+

+    /**

+     * dts from the last AVPacket that has been input into the decoder

+     * - encoding: unused

+     * - decoding: Read by user.

+     */

+    int64_t pkt_dts;

+

+    /**

+     * the AVCodecContext which ff_thread_get_buffer() was last called on

+     * - encoding: Set by libavcodec.

+     * - decoding: Set by libavcodec.

+     */

+    struct AVCodecContext *owner;

+

+    /**

+     * used by multithreading to store frame-specific info

+     * - encoding: Set by libavcodec.

+     * - decoding: Set by libavcodec.

+     */

+    void *thread_opaque;

+

+    /**

+     * frame timestamp estimated using various heuristics, in stream time base

+     * - encoding: unused

+     * - decoding: set by libavcodec, read by user.

+     */

+    int64_t best_effort_timestamp;

+

+    /**

+     * reordered pos from the last AVPacket that has been input into the decoder

+     * - encoding: unused

+     * - decoding: Read by user.

+     */

+    int64_t pkt_pos;

+

+    /**

+     * reordered sample aspect ratio for the video frame, 0/1 if unknown\unspecified

+     * - encoding: unused

+     * - decoding: Read by user.

+     */

+    AVRational sample_aspect_ratio;

+

+    /**

+     * width and height of the video frame

+     * - encoding: unused

+     * - decoding: Read by user.

+     */

+    int width, height;

+

+    /**

+     * format of the frame, -1 if unknown or unset

+     * It should be cast to the corresponding enum (enum PixelFormat

+     * for video, enum AVSampleFormat for audio)

+     * - encoding: unused

+     * - decoding: Read by user.

+     */

+    int format;

+

 } AVFrame;

 /**

@@ -333,9 +333,9 @@ static inline void mc_dir_part(AVSContext *h,Picture *pic,int square,

     const int mx= mv->x + src_x_offset*8;

     const int my= mv->y + src_y_offset*8;

     const int luma_xy= (mx&3) + ((my&3)<<2);

-    uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*h->l_stride;

-    uint8_t * src_cb= pic->data[1] + (mx>>3) + (my>>3)*h->c_stride;

-    uint8_t * src_cr= pic->data[2] + (mx>>3) + (my>>3)*h->c_stride;

+    uint8_t * src_y  = pic->f.data[0] + (mx >> 2) + (my >> 2) * h->l_stride;

+    uint8_t * src_cb = pic->f.data[1] + (mx >> 3) + (my >> 3) * h->c_stride;

+    uint8_t * src_cr = pic->f.data[2] + (mx >> 3) + (my >> 3) * h->c_stride;

     int extra_width= 0; //(s->flags&CODEC_FLAG_EMU_EDGE) ? 0 : 16;

     int extra_height= extra_width;

     int emu=0;

@@ -344,7 +344,7 @@ static inline void mc_dir_part(AVSContext *h,Picture *pic,int square,

     const int pic_width  = 16*h->mb_width;

     const int pic_height = 16*h->mb_height;

-    if(!pic->data[0])

+    if(!pic->f.data[0])

         return;

     if(mx&7) extra_width -= 3;

     if(my&7) extra_height -= 3;

@@ -602,9 +602,9 @@ int ff_cavs_next_mb(AVSContext *h) {

         h->mbx = 0;

         h->mby++;

         /* re-calculate sample pointers */

-        h->cy = h->picture.data[0] + h->mby*16*h->l_stride;

-        h->cu = h->picture.data[1] + h->mby*8*h->c_stride;

-        h->cv = h->picture.data[2] + h->mby*8*h->c_stride;

+        h->cy = h->picture.f.data[0] + h->mby * 16 * h->l_stride;

+        h->cu = h->picture.f.data[1] + h->mby *  8 * h->c_stride;

+        h->cv = h->picture.f.data[2] + h->mby *  8 * h->c_stride;

         if(h->mby == h->mb_height) { //frame end

             return 0;

         }

@@ -629,11 +629,11 @@ void ff_cavs_init_pic(AVSContext *h) {

     h->mv[MV_FWD_X0] = ff_cavs_dir_mv;

     set_mvs(&h->mv[MV_FWD_X0], BLK_16X16);

     h->pred_mode_Y[3] = h->pred_mode_Y[6] = NOT_AVAIL;

-    h->cy = h->picture.data[0];

-    h->cu = h->picture.data[1];

-    h->cv = h->picture.data[2];

-    h->l_stride = h->picture.linesize[0];

-    h->c_stride = h->picture.linesize[1];

+    h->cy           = h->picture.f.data[0];

+    h->cu           = h->picture.f.data[1];

+    h->cv           = h->picture.f.data[2];

+    h->l_stride     = h->picture.f.linesize[0];

+    h->c_stride     = h->picture.f.linesize[1];

     h->luma_scan[2] = 8*h->l_stride;

     h->luma_scan[3] = 8*h->l_stride+8;

     h->mbx = h->mby = h->mbidx = 0;

@@ -476,8 +476,8 @@ static int decode_pic(AVSContext *h) {

             return -1;

         }

         /* make sure we have the reference frames we need */

-        if(!h->DPB[0].data[0] ||

-          (!h->DPB[1].data[0] && h->pic_type == AV_PICTURE_TYPE_B))

+        if(!h->DPB[0].f.data[0] ||

+          (!h->DPB[1].f.data[0] && h->pic_type == AV_PICTURE_TYPE_B))

             return -1;

     } else {

         h->pic_type = AV_PICTURE_TYPE_I;

@@ -494,7 +494,7 @@ static int decode_pic(AVSContext *h) {

             skip_bits(&s->gb,1); //marker_bit

     }

     /* release last B frame */

-    if(h->picture.data[0])

+    if(h->picture.f.data[0])

         s->avctx->release_buffer(s->avctx, (AVFrame *)&h->picture);

     s->avctx->get_buffer(s->avctx, (AVFrame *)&h->picture);

@@ -585,7 +585,7 @@ static int decode_pic(AVSContext *h) {

         } while(ff_cavs_next_mb(h));

     }

     if(h->pic_type != AV_PICTURE_TYPE_B) {

-        if(h->DPB[1].data[0])

+        if(h->DPB[1].f.data[0])

             s->avctx->release_buffer(s->avctx, (AVFrame *)&h->DPB[1]);

         h->DPB[1] = h->DPB[0];

         h->DPB[0] = h->picture;

@@ -648,7 +648,7 @@ static int cavs_decode_frame(AVCodecContext * avctx,void *data, int *data_size,

     s->avctx = avctx;

     if (buf_size == 0) {

-        if(!s->low_delay && h->DPB[0].data[0]) {

+        if (!s->low_delay && h->DPB[0].f.data[0]) {

             *data_size = sizeof(AVPicture);

             *picture = *(AVFrame *) &h->DPB[0];

         }

@@ -669,9 +669,9 @@ static int cavs_decode_frame(AVCodecContext * avctx,void *data, int *data_size,

             break;

         case PIC_I_START_CODE:

             if(!h->got_keyframe) {

-                if(h->DPB[0].data[0])

+                if(h->DPB[0].f.data[0])

                     avctx->release_buffer(avctx, (AVFrame *)&h->DPB[0]);

-                if(h->DPB[1].data[0])

+                if(h->DPB[1].f.data[0])

                     avctx->release_buffer(avctx, (AVFrame *)&h->DPB[1]);

                 h->got_keyframe = 1;

             }

@@ -685,7 +685,7 @@ static int cavs_decode_frame(AVCodecContext * avctx,void *data, int *data_size,

                 break;

             *data_size = sizeof(AVPicture);

             if(h->pic_type != AV_PICTURE_TYPE_B) {

-                if(h->DPB[1].data[0]) {

+                if(h->DPB[1].f.data[0]) {

                     *picture = *(AVFrame *) &h->DPB[1];

                 } else {

                     *data_size = 0;

@@ -24,7 +24,7 @@

 void *ff_dxva2_get_surface(const Picture *picture)

 {

-    return picture->data[3];

+    return picture->f.data[3];

 }

 unsigned ff_dxva2_get_surface_index(const struct dxva_context *ctx,

@@ -70,15 +70,15 @@ static void fill_picture_parameters(struct dxva_context *ctx, const H264Context

                                ff_dxva2_get_surface_index(ctx, r),

                                r->long_ref != 0);

-            if ((r->reference & PICT_TOP_FIELD) && r->field_poc[0] != INT_MAX)

+            if ((r->f.reference & PICT_TOP_FIELD) && r->field_poc[0] != INT_MAX)

                 pp->FieldOrderCntList[i][0] = r->field_poc[0];

-            if ((r->reference & PICT_BOTTOM_FIELD) && r->field_poc[1] != INT_MAX)

+            if ((r->f.reference & PICT_BOTTOM_FIELD) && r->field_poc[1] != INT_MAX)

                 pp->FieldOrderCntList[i][1] = r->field_poc[1];

             pp->FrameNumList[i] = r->long_ref ? r->pic_id : r->frame_num;

-            if (r->reference & PICT_TOP_FIELD)

+            if (r->f.reference & PICT_TOP_FIELD)

                 pp->UsedForReferenceFlags |= 1 << (2*i + 0);

-            if (r->reference & PICT_BOTTOM_FIELD)

+            if (r->f.reference & PICT_BOTTOM_FIELD)

                 pp->UsedForReferenceFlags |= 1 << (2*i + 1);

         } else {

             pp->RefFrameList[i].bPicEntry = 0xff;

@@ -229,7 +229,7 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice,

                 unsigned plane;

                 fill_picture_entry(&slice->RefPicList[list][i],

                                    ff_dxva2_get_surface_index(ctx, r),

-                                   r->reference == PICT_BOTTOM_FIELD);

+                                   r->f.reference == PICT_BOTTOM_FIELD);

                 for (plane = 0; plane < 3; plane++) {

                     int w, o;