Fix #1164 crash on hwaccel and avformat-novalidate

ddennedy · ddennedy · commit da6b2c157c53 · 2025-10-24T08:50:05.000-07:00
regression in 2999a10
diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
@@ -1024,9 +1024,6 @@ static int setup_filters(producer_avformat self)
         }
     }
 
-    if (self->hwaccel.device_type != AV_HWDEVICE_TYPE_NONE)
-        return -1;
-
     if (!self->vfilter_graph && (self->autorotate || filtergraph) && self->video_index != -1) {
         AVFilterContext *last_filter = NULL;
         if (self->autorotate) {
@@ -1261,7 +1258,7 @@ static int producer_open(
                 if (self->audio_format && !self->audio_streams)
                     get_audio_streams_info(self);
 
-                if (!test_open) {
+                if (!test_open && (self->hwaccel.device_type == AV_HWDEVICE_TYPE_NONE)) {
                     error = setup_filters(self);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -1024,9 +1024,6 @@ static int setup_filters(producer_avformat self)`
`1024`	`1024`	`}`
`1025`	`1025`	`}`
`1026`	`1026`
`1027`		`- if (self->hwaccel.device_type != AV_HWDEVICE_TYPE_NONE)`
`1028`		`- return -1;`
`1029`		`-`
`1030`	`1027`	`if (!self->vfilter_graph && (self->autorotate \|\| filtergraph) && self->video_index != -1) {`
`1031`	`1028`	`AVFilterContext *last_filter = NULL;`
`1032`	`1029`	`if (self->autorotate) {`
`@@ -1261,7 +1258,7 @@ static int producer_open(`
`1261`	`1258`	`if (self->audio_format && !self->audio_streams)`
`1262`	`1259`	`get_audio_streams_info(self);`
`1263`	`1260`
`1264`		`- if (!test_open) {`
	`1261`	`+ if (!test_open && (self->hwaccel.device_type == AV_HWDEVICE_TYPE_NONE)) {`
`1265`	`1262`	`error = setup_filters(self);`
`1266`	`1263`	`}`
`1267`	`1264`	`}`