lavc: deprecate unused AVCodecContext.stream_codec_tag

[ffmpeg] / avconv.h

diff --git a/avconv.h b/avconv.h
index 2484314f3425ccb16e8e08bdc21a45109acc21ec..b932d7e8db3df7b3cf3eb7293e3f52ccf8e25fd2 100644 (file)
--- a/avconv.h
+++ b/avconv.h
@@ -52,6 +52,8 @@ enum HWAccelID {
     HWACCEL_NONE = 0,
     HWACCEL_AUTO,
     HWACCEL_VDPAU,
+    HWACCEL_DXVA2,
+    HWACCEL_VDA,
 };
 
 typedef struct HWAccel {
@@ -217,6 +219,7 @@ typedef struct InputStream {
     AVStream *st;
     int discard;             /* true if stream data should be discarded */
     int decoding_needed;     /* true if the packets must be decoded in 'raw_fifo' */
+    AVCodecContext *dec_ctx;
     AVCodec *dec;
     AVFrame *decoded_frame;
     AVFrame *filter_frame; /* a ref of decoded_frame, to be sent to filters */
@@ -230,7 +233,7 @@ typedef struct InputStream {
     PtsCorrectionContext pts_ctx;
     double ts_scale;
     int showed_multi_packet_warning;
-    AVDictionary *opts;
+    AVDictionary *decoder_opts;
     AVRational framerate;               /* framerate forced with -r */
 
     int resample_height;
@@ -311,6 +314,7 @@ typedef struct OutputStream {
     /* dts of the last packet sent to the muxer */
     int64_t last_mux_dts;
     AVBitStreamFilterContext *bitstream_filters;
+    AVCodecContext *enc_ctx;
     AVCodec *enc;
     int64_t max_frames;
     AVFrame *filtered_frame;
@@ -335,7 +339,7 @@ typedef struct OutputStream {
     char *avfilter;
 
     int64_t sws_flags;
-    AVDictionary *opts;
+    AVDictionary *encoder_opts;
     AVDictionary *resample_opts;
     int finished;        /* no more packets should be written for this stream */
     int stream_copy;
@@ -421,5 +425,7 @@ FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost);
 int avconv_parse_options(int argc, char **argv);
 
 int vdpau_init(AVCodecContext *s);
+int dxva2_init(AVCodecContext *s);
+int vda_init(AVCodecContext *s);
 
 #endif /* AVCONV_H */