summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2016-10-24 22:54:03 +0200
committerClément Bœsch <u@pkh.me>2016-11-18 20:23:58 +0100
commitb9c26aed4e3ca396d826b4566d5f3fef8b08b424 (patch)
tree60cefeff9671f9e24c85ba4b78bc510d0702ea95 /ffmpeg.c
parentd1d18de6ade3ad5690f1eba9e005bab797d94ac6 (diff)
ffmpeg: remove dead code out of the video filter loop
It makes no sense for this code to be inside the video filter loop, and the frame sample aspect ratio is even set unconditionally a few lines above.
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index a6e9476e21..2c46b22f24 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2201,7 +2201,6 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int eo
int i, ret = 0, err = 0, resample_changed;
int64_t best_effort_timestamp;
int64_t dts = AV_NOPTS_VALUE;
- AVRational *frame_sample_aspect;
AVPacket avpkt;
// With fate-indeo3-2, we're getting 0-sized packets before EOF for some
@@ -2347,11 +2346,7 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int eo
}
}
- frame_sample_aspect= av_opt_ptr(avcodec_get_frame_class(), decoded_frame, "sample_aspect_ratio");
for (i = 0; i < ist->nb_filters; i++) {
- if (!frame_sample_aspect->num)
- *frame_sample_aspect = ist->st->sample_aspect_ratio;
-
if (i < ist->nb_filters - 1) {
f = ist->filter_frame;
err = av_frame_ref(f, decoded_frame);