diff mbox series

[FFmpeg-devel,4/4] avisynth: fix deprecation warning

Message ID 20200312233802.4033-4-qyot27@gmail.com
State New
Headers show
Series [FFmpeg-devel,1/4] compat: remove avisynth headers | expand

Checks

Context Check Description
andriy/ffmpeg-patchwork success Make fate finished

Commit Message

Stephen Hutchinson March 12, 2020, 11:38 p.m. UTC 
---
 libavformat/avisynth.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Stephen Hutchinson March 24, 2020, 6:40 p.m. UTC | #1 
On 3/12/20 7:38 PM, Stephen Hutchinson wrote:
> ---
>   libavformat/avisynth.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
> index 43b65badc9..2c08ace8db 100644
> --- a/libavformat/avisynth.c
> +++ b/libavformat/avisynth.c
> @@ -555,12 +555,12 @@ static int avisynth_open_file(AVFormatContext *s)
>   
>   #ifdef _WIN32
>       /* Convert UTF-8 to ANSI code page */
> -    MultiByteToWideChar(CP_UTF8, 0, s->filename, -1, filename_wc, MAX_PATH * 4);
> +    MultiByteToWideChar(CP_UTF8, 0, s->url, -1, filename_wc, MAX_PATH * 4);
>       WideCharToMultiByte(CP_THREAD_ACP, 0, filename_wc, -1, filename_ansi,
>                           MAX_PATH * 4, NULL, NULL);
>       arg = avs_new_value_string(filename_ansi);
>   #else
> -    arg = avs_new_value_string(s->filename);
> +    arg = avs_new_value_string(s->url);
>   #endif
>       val = avs_library.avs_invoke(avs->env, "Import", arg, 0);
>       if (avs_is_error(val)) {
> 

Ping.
Stephen Hutchinson April 4, 2020, 9:56 p.m. UTC | #2 
On 3/24/2020 2:40 PM, Stephen Hutchinson wrote:
> On 3/12/20 7:38 PM, Stephen Hutchinson wrote:
>> ---
>>   libavformat/avisynth.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
>> index 43b65badc9..2c08ace8db 100644
>> --- a/libavformat/avisynth.c
>> +++ b/libavformat/avisynth.c
>> @@ -555,12 +555,12 @@ static int avisynth_open_file(AVFormatContext *s)
>>   #ifdef _WIN32
>>       /* Convert UTF-8 to ANSI code page */
>> -    MultiByteToWideChar(CP_UTF8, 0, s->filename, -1, filename_wc, 
>> MAX_PATH * 4);
>> +    MultiByteToWideChar(CP_UTF8, 0, s->url, -1, filename_wc, MAX_PATH 
>> * 4);
>>       WideCharToMultiByte(CP_THREAD_ACP, 0, filename_wc, -1, 
>> filename_ansi,
>>                           MAX_PATH * 4, NULL, NULL);
>>       arg = avs_new_value_string(filename_ansi);
>>   #else
>> -    arg = avs_new_value_string(s->filename);
>> +    arg = avs_new_value_string(s->url);
>>   #endif
>>       val = avs_library.avs_invoke(avs->env, "Import", arg, 0);
>>       if (avs_is_error(val)) {
>>
> 
> Ping.

Ping #2.

On Patchwork:
https://patchwork.ffmpeg.org/project/ffmpeg/patch/20200312233802.4033-4-qyot27@gmail.com/
Carl Eugen Hoyos April 4, 2020, 10 p.m. UTC | #3 
Am Fr., 13. März 2020 um 00:38 Uhr schrieb Stephen Hutchinson
<qyot27@gmail.com>:
>
> ---
>  libavformat/avisynth.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
> index 43b65badc9..2c08ace8db 100644
> --- a/libavformat/avisynth.c
> +++ b/libavformat/avisynth.c
> @@ -555,12 +555,12 @@ static int avisynth_open_file(AVFormatContext *s)
>
>  #ifdef _WIN32
>      /* Convert UTF-8 to ANSI code page */
> -    MultiByteToWideChar(CP_UTF8, 0, s->filename, -1, filename_wc, MAX_PATH * 4);
> +    MultiByteToWideChar(CP_UTF8, 0, s->url, -1, filename_wc, MAX_PATH * 4);
>      WideCharToMultiByte(CP_THREAD_ACP, 0, filename_wc, -1, filename_ansi,
>                          MAX_PATH * 4, NULL, NULL);
>      arg = avs_new_value_string(filename_ansi);
>  #else
> -    arg = avs_new_value_string(s->filename);
> +    arg = avs_new_value_string(s->url);
>  #endif
>      val = avs_library.avs_invoke(avs->env, "Import", arg, 0);
>      if (avs_is_error(val)) {
> --
> 2.20.1

Applying: avisynth: fix deprecation warning
error: patch failed: libavformat/avisynth.c:555
error: libavformat/avisynth.c: patch does not apply
Patch failed at 0001 avisynth: fix deprecation warning

Carl Eugen
Marton Balint April 4, 2020, 10:48 p.m. UTC | #4 
On Sun, 5 Apr 2020, Carl Eugen Hoyos wrote:

> Am Fr., 13. März 2020 um 00:38 Uhr schrieb Stephen Hutchinson
> <qyot27@gmail.com>:
>>
>> ---
>>  libavformat/avisynth.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
>> index 43b65badc9..2c08ace8db 100644
>> --- a/libavformat/avisynth.c
>> +++ b/libavformat/avisynth.c
>> @@ -555,12 +555,12 @@ static int avisynth_open_file(AVFormatContext *s)
>>
>>  #ifdef _WIN32
>>      /* Convert UTF-8 to ANSI code page */
>> -    MultiByteToWideChar(CP_UTF8, 0, s->filename, -1, filename_wc, MAX_PATH * 4);
>> +    MultiByteToWideChar(CP_UTF8, 0, s->url, -1, filename_wc, MAX_PATH * 4);
>>      WideCharToMultiByte(CP_THREAD_ACP, 0, filename_wc, -1, filename_ansi,
>>                          MAX_PATH * 4, NULL, NULL);
>>      arg = avs_new_value_string(filename_ansi);
>>  #else
>> -    arg = avs_new_value_string(s->filename);
>> +    arg = avs_new_value_string(s->url);
>>  #endif
>>      val = avs_library.avs_invoke(avs->env, "Import", arg, 0);
>>      if (avs_is_error(val)) {
>> --
>> 2.20.1
>
> Applying: avisynth: fix deprecation warning
> error: patch failed: libavformat/avisynth.c:555
> error: libavformat/avisynth.c: patch does not apply
> Patch failed at 0001 avisynth: fix deprecation warning

Have you applied the previous patches in the series? In order they 
applied to me all cleanly.

Regards,
Marton
Carl Eugen Hoyos April 4, 2020, 10:52 p.m. UTC | #5 
Am So., 5. Apr. 2020 um 00:48 Uhr schrieb Marton Balint <cus@passwd.hu>:
>
>
>
> On Sun, 5 Apr 2020, Carl Eugen Hoyos wrote:
>
> > Am Fr., 13. März 2020 um 00:38 Uhr schrieb Stephen Hutchinson
> > <qyot27@gmail.com>:
> >>
> >> ---
> >>  libavformat/avisynth.c | 4 ++--
> >>  1 file changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
> >> index 43b65badc9..2c08ace8db 100644
> >> --- a/libavformat/avisynth.c
> >> +++ b/libavformat/avisynth.c
> >> @@ -555,12 +555,12 @@ static int avisynth_open_file(AVFormatContext *s)
> >>
> >>  #ifdef _WIN32
> >>      /* Convert UTF-8 to ANSI code page */
> >> -    MultiByteToWideChar(CP_UTF8, 0, s->filename, -1, filename_wc, MAX_PATH * 4);
> >> +    MultiByteToWideChar(CP_UTF8, 0, s->url, -1, filename_wc, MAX_PATH * 4);
> >>      WideCharToMultiByte(CP_THREAD_ACP, 0, filename_wc, -1, filename_ansi,
> >>                          MAX_PATH * 4, NULL, NULL);
> >>      arg = avs_new_value_string(filename_ansi);
> >>  #else
> >> -    arg = avs_new_value_string(s->filename);
> >> +    arg = avs_new_value_string(s->url);
> >>  #endif
> >>      val = avs_library.avs_invoke(avs->env, "Import", arg, 0);
> >>      if (avs_is_error(val)) {
> >> --
> >> 2.20.1
> >
> > Applying: avisynth: fix deprecation warning
> > error: patch failed: libavformat/avisynth.c:555
> > error: libavformat/avisynth.c: patch does not apply
> > Patch failed at 0001 avisynth: fix deprecation warning
>
> Have you applied the previous patches in the series? In order they
> applied to me all cleanly.

Then please push them, the pings apparently did not arrive here
in the right order.

Carl Eugen
Marton Balint April 4, 2020, 11:25 p.m. UTC | #6 
On Sun, 5 Apr 2020, Carl Eugen Hoyos wrote:

> Am So., 5. Apr. 2020 um 00:48 Uhr schrieb Marton Balint <cus@passwd.hu>:
>>
>>
>>
>> On Sun, 5 Apr 2020, Carl Eugen Hoyos wrote:
>>
>> > Am Fr., 13. März 2020 um 00:38 Uhr schrieb Stephen Hutchinson
>> > <qyot27@gmail.com>:
>> >>
>> >> ---
>> >>  libavformat/avisynth.c | 4 ++--
>> >>  1 file changed, 2 insertions(+), 2 deletions(-)
>> >>
>> >> diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
>> >> index 43b65badc9..2c08ace8db 100644
>> >> --- a/libavformat/avisynth.c
>> >> +++ b/libavformat/avisynth.c
>> >> @@ -555,12 +555,12 @@ static int avisynth_open_file(AVFormatContext *s)
>> >>
>> >>  #ifdef _WIN32
>> >>      /* Convert UTF-8 to ANSI code page */
>> >> -    MultiByteToWideChar(CP_UTF8, 0, s->filename, -1, filename_wc, MAX_PATH * 4);
>> >> +    MultiByteToWideChar(CP_UTF8, 0, s->url, -1, filename_wc, MAX_PATH * 4);
>> >>      WideCharToMultiByte(CP_THREAD_ACP, 0, filename_wc, -1, filename_ansi,
>> >>                          MAX_PATH * 4, NULL, NULL);
>> >>      arg = avs_new_value_string(filename_ansi);
>> >>  #else
>> >> -    arg = avs_new_value_string(s->filename);
>> >> +    arg = avs_new_value_string(s->url);
>> >>  #endif
>> >>      val = avs_library.avs_invoke(avs->env, "Import", arg, 0);
>> >>      if (avs_is_error(val)) {
>> >> --
>> >> 2.20.1
>> >
>> > Applying: avisynth: fix deprecation warning
>> > error: patch failed: libavformat/avisynth.c:555
>> > error: libavformat/avisynth.c: patch does not apply
>> > Patch failed at 0001 avisynth: fix deprecation warning
>>
>> Have you applied the previous patches in the series? In order they
>> applied to me all cleanly.
>
> Then please push them, the pings apparently did not arrive here
> in the right order.

Ok, applied the series with a Changelog entry.

Regards,
Marton
diff mbox series

Patch

diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
index 43b65badc9..2c08ace8db 100644
--- a/libavformat/avisynth.c
+++ b/libavformat/avisynth.c
@@ -555,12 +555,12 @@  static int avisynth_open_file(AVFormatContext *s)
 
 #ifdef _WIN32
     /* Convert UTF-8 to ANSI code page */
-    MultiByteToWideChar(CP_UTF8, 0, s->filename, -1, filename_wc, MAX_PATH * 4);
+    MultiByteToWideChar(CP_UTF8, 0, s->url, -1, filename_wc, MAX_PATH * 4);
     WideCharToMultiByte(CP_THREAD_ACP, 0, filename_wc, -1, filename_ansi,
                         MAX_PATH * 4, NULL, NULL);
     arg = avs_new_value_string(filename_ansi);
 #else
-    arg = avs_new_value_string(s->filename);
+    arg = avs_new_value_string(s->url);
 #endif
     val = avs_library.avs_invoke(avs->env, "Import", arg, 0);
     if (avs_is_error(val)) {