[FFmpeg-cvslog] fftools/ffmpeg: drop unused hwaccel variables
Anton Khirnov
git at videolan.org
Thu Jul 28 18:01:54 EEST 2022
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Jun 19 19:27:13 2022 +0200| [6353b2804237b1493bc0ac69a467859b85c44b3d] | committer: Anton Khirnov
fftools/ffmpeg: drop unused hwaccel variables
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6353b2804237b1493bc0ac69a467859b85c44b3d
---
fftools/ffmpeg.c | 3 ---
fftools/ffmpeg.h | 6 ------
2 files changed, 9 deletions(-)
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index a08aafac46..8c9786d5fc 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -2275,7 +2275,6 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_
if (err < 0)
goto fail;
}
- ist->hwaccel_retrieved_pix_fmt = decoded_frame->format;
best_effort_timestamp= decoded_frame->best_effort_timestamp;
*duration_pts = decoded_frame->duration;
@@ -4428,8 +4427,6 @@ static int transcode(void)
ist = input_streams[i];
if (ist->decoding_needed) {
avcodec_close(ist->dec_ctx);
- if (ist->hwaccel_uninit)
- ist->hwaccel_uninit(ist->dec_ctx);
}
}
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index 0795a380f8..bc78570d16 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -385,12 +385,8 @@ typedef struct InputStream {
char *hwaccel_device;
enum AVPixelFormat hwaccel_output_format;
- /* hwaccel context */
- void *hwaccel_ctx;
- void (*hwaccel_uninit)(AVCodecContext *s);
int (*hwaccel_retrieve_data)(AVCodecContext *s, AVFrame *frame);
enum AVPixelFormat hwaccel_pix_fmt;
- enum AVPixelFormat hwaccel_retrieved_pix_fmt;
/* stats */
// combined size of all the packets read
@@ -493,8 +489,6 @@ typedef struct OutputStream {
int64_t last_dropped;
int64_t last_nb0_frames[3];
- void *hwaccel_ctx;
-
/* video only */
AVRational frame_rate;
AVRational max_frame_rate;
More information about the ffmpeg-cvslog
mailing list