diff mbox

[FFmpeg-devel] ffmpeg: Remove hw_device_ctx output filter reinit hack

Message ID 0d5b5128-fefc-6dac-04dc-07fac405c49a@jkqxz.net
State Accepted
Commit a94972b2b2e6b0370b69c664cacf4397c8bf33e9
Headers show

Commit Message

Mark Thompson March 22, 2017, 9:26 p.m. UTC 
This was skipped in c17563c5d3c974a69709ebae0171534763b3051c because
it depended on the filter setup merge, but was forgotten after that
actually happened.

Fixes hwaccel fate for stream size change tests.
---
 ffmpeg_filter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

wm4 March 23, 2017, 6:09 a.m. UTC | #1 
On Wed, 22 Mar 2017 21:26:27 +0000
Mark Thompson <sw@jkqxz.net> wrote:

> This was skipped in c17563c5d3c974a69709ebae0171534763b3051c because
> it depended on the filter setup merge, but was forgotten after that
> actually happened.
> 
> Fixes hwaccel fate for stream size change tests.
> ---
>  ffmpeg_filter.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
> index 5cc640d75d..219e473f69 100644
> --- a/ffmpeg_filter.c
> +++ b/ffmpeg_filter.c
> @@ -460,7 +460,7 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter,
>      if (ret < 0)
>          return ret;
>  
> -    if (!hw_device_ctx && (ofilter->width || ofilter->height)) {
> +    if (ofilter->width || ofilter->height) {
>          char args[255];
>          AVFilterContext *filter;
>          AVDictionaryEntry *e = NULL;

LGTM
Mark Thompson March 26, 2017, 8:33 p.m. UTC | #2 
On 23/03/17 06:09, wm4 wrote:
> On Wed, 22 Mar 2017 21:26:27 +0000
> Mark Thompson <sw@jkqxz.net> wrote:
> 
>> This was skipped in c17563c5d3c974a69709ebae0171534763b3051c because
>> it depended on the filter setup merge, but was forgotten after that
>> actually happened.
>>
>> Fixes hwaccel fate for stream size change tests.
>> ---
>>  ffmpeg_filter.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
>> index 5cc640d75d..219e473f69 100644
>> --- a/ffmpeg_filter.c
>> +++ b/ffmpeg_filter.c
>> @@ -460,7 +460,7 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter,
>>      if (ret < 0)
>>          return ret;
>>  
>> -    if (!hw_device_ctx && (ofilter->width || ofilter->height)) {
>> +    if (ofilter->width || ofilter->height) {
>>          char args[255];
>>          AVFilterContext *filter;
>>          AVDictionaryEntry *e = NULL;
> 
> LGTM

Applied.

Thanks,

- Mark
diff mbox

Patch

diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index 5cc640d75d..219e473f69 100644
--- a/ffmpeg_filter.c
+++ b/ffmpeg_filter.c
@@ -460,7 +460,7 @@  static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter,
     if (ret < 0)
         return ret;
 
-    if (!hw_device_ctx && (ofilter->width || ofilter->height)) {
+    if (ofilter->width || ofilter->height) {
         char args[255];
         AVFilterContext *filter;
         AVDictionaryEntry *e = NULL;