History

fftools/ffmpeg_demux: don't insert the crop filter if frame cropping side data defines no cropping

James Almer committed 2 years ago

Commit 90672971 parent fa5a6051 file · +2 −1Browse files

Unified · Split

fftools/ffmpeg_demux.c+2−1
@@ -1014,7 +1014,8 @@ int ist_filter_add(InputStream *ist, InputFilter *ifilter, int is_simple, · 1013 unmodified lines
1014 opts->crop_bottom = AV_RL32(sd->data + 4);1014 opts->crop_bottom = AV_RL32(sd->data + 4);
1015 opts->crop_left = AV_RL32(sd->data + 8);1015 opts->crop_left = AV_RL32(sd->data + 8);
1016 opts->crop_right = AV_RL32(sd->data + 12);1016 opts->crop_right = AV_RL32(sd->data + 12);
1017 if (ds->apply_cropping && ds->apply_cropping != CROP_CODEC)1017 if (ds->apply_cropping && ds->apply_cropping != CROP_CODEC &&
1018 (opts->crop_top | opts->crop_bottom | opts->crop_left | opts->crop_right))
1018 opts->flags |= IFILTER_FLAG_CROP;1019 opts->flags |= IFILTER_FLAG_CROP;
1019 }1020 }
1020 } else if (ist->par->codec_type == AVMEDIA_TYPE_SUBTITLE) {1021 } else if (ist->par->codec_type == AVMEDIA_TYPE_SUBTITLE) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t