ffmpeg, ffprobe: don't "merge" side data into packet data by default

[ffmpeg] / libavcodec / qsvdec.h

diff --git a/libavcodec/qsvdec.h b/libavcodec/qsvdec.h
index 0bf1e55ffa7b582929948b0db6a602d9c14c8c56..41fb71682c27e5639da4a0fc0060d826bb1d44d9 100644 (file)
--- a/libavcodec/qsvdec.h
+++ b/libavcodec/qsvdec.h
@@ -56,6 +56,8 @@ typedef struct QSVContext {
     AVCodecParserContext *parser;
     AVCodecContext *avctx_internal;
     enum AVPixelFormat orig_pix_fmt;
+    uint32_t fourcc;
+    mfxFrameInfo frame_info;
 
     // options set by the caller
     int async_depth;
@@ -67,8 +69,6 @@ typedef struct QSVContext {
     int         nb_ext_buffers;
 } QSVContext;
 
-int ff_qsv_map_pixfmt(enum AVPixelFormat format);
-
 int ff_qsv_process_data(AVCodecContext *avctx, QSVContext *q,
                         AVFrame *frame, int *got_frame, AVPacket *pkt);