diff mbox series

[FFmpeg-devel] ffmpeg: Do not print "SDL:" on top of sdl output file

Message ID CAB0OVGpHdsUutRRruFm_3S=KUXULFZ5B9F+gjiC-hCVi+SjaWQ@mail.gmail.com
State Accepted
Headers show
Series [FFmpeg-devel] ffmpeg: Do not print "SDL:" on top of sdl output file | expand

Checks

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

Commit Message

Carl Eugen Hoyos Jan. 26, 2020, 8:57 p.m. UTC 
Hi!

Attached patch is supposed to fix ticket #7068.

Please comment, Carl Eugen

Comments

Michael Niedermayer Jan. 26, 2020, 11:45 p.m. UTC | #1 
On Sun, Jan 26, 2020 at 09:57:59PM +0100, Carl Eugen Hoyos wrote:
> Hi!
> 
> Attached patch is supposed to fix ticket #7068.
> 
> Please comment, Carl Eugen

>  ffmpeg.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 5a59a8ef62b4bfcde812f8ce81aee5c0f39c02db  0001-ffmpeg-Do-not-print-SDP-on-top-of-sdp-files.patch
> From ab80ef51e9ea87a3d3d0796aabd23b4bef85a4c3 Mon Sep 17 00:00:00 2001
> From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> Date: Sun, 26 Jan 2020 21:47:26 +0100
> Subject: [PATCH] ffmpeg: Do not print "SDP:" on top of sdp files.
> 
> Fixes ticket #7068.
> ---
>  fftools/ffmpeg.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
> index 6bcd7b94d2..d4ff30d6fb 100644
> --- a/fftools/ffmpeg.c
> +++ b/fftools/ffmpeg.c
> @@ -2776,7 +2776,7 @@ static void print_sdp(void)
>          if (avio_open2(&sdp_pb, sdp_filename, AVIO_FLAG_WRITE, &int_cb, NULL) < 0) {
>              av_log(NULL, AV_LOG_ERROR, "Failed to open sdp file '%s'\n", sdp_filename);
>          } else {
> -            avio_printf(sdp_pb, "SDP:\n%s", sdp);
> +            avio_printf(sdp_pb, "%s", sdp);

Are there any scripts/sw which expects this SDP prefix ?
if not then this patch should be ok

thx

[...]
Carl Eugen Hoyos Jan. 26, 2020, 11:54 p.m. UTC | #2 
Am Mo., 27. Jan. 2020 um 00:45 Uhr schrieb Michael Niedermayer
<michael@niedermayer.cc>:
>
> On Sun, Jan 26, 2020 at 09:57:59PM +0100, Carl Eugen Hoyos wrote:
> > Hi!
> >
> > Attached patch is supposed to fix ticket #7068.
> >
> > Please comment, Carl Eugen
>
> >  ffmpeg.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 5a59a8ef62b4bfcde812f8ce81aee5c0f39c02db  0001-ffmpeg-Do-not-print-SDP-on-top-of-sdp-files.patch
> > From ab80ef51e9ea87a3d3d0796aabd23b4bef85a4c3 Mon Sep 17 00:00:00 2001
> > From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> > Date: Sun, 26 Jan 2020 21:47:26 +0100
> > Subject: [PATCH] ffmpeg: Do not print "SDP:" on top of sdp files.
> >
> > Fixes ticket #7068.
> > ---
> >  fftools/ffmpeg.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
> > index 6bcd7b94d2..d4ff30d6fb 100644
> > --- a/fftools/ffmpeg.c
> > +++ b/fftools/ffmpeg.c
> > @@ -2776,7 +2776,7 @@ static void print_sdp(void)
> >          if (avio_open2(&sdp_pb, sdp_filename, AVIO_FLAG_WRITE, &int_cb, NULL) < 0) {
> >              av_log(NULL, AV_LOG_ERROR, "Failed to open sdp file '%s'\n", sdp_filename);
> >          } else {
> > -            avio_printf(sdp_pb, "SDP:\n%s", sdp);
> > +            avio_printf(sdp_pb, "%s", sdp);
>
> Are there any scripts/sw which expects this SDP prefix ?

I don't know but it apparently contradicts the rfc and makes
vlc fail on our sdp files.

Carl Eugen
Marton Balint Jan. 27, 2020, 12:12 a.m. UTC | #3 
On Mon, 27 Jan 2020, Carl Eugen Hoyos wrote:

> Am Mo., 27. Jan. 2020 um 00:45 Uhr schrieb Michael Niedermayer
> <michael@niedermayer.cc>:
>>
>> On Sun, Jan 26, 2020 at 09:57:59PM +0100, Carl Eugen Hoyos wrote:
>> > Hi!
>> >
>> > Attached patch is supposed to fix ticket #7068.
>> >
>> > Please comment, Carl Eugen
>>
>> >  ffmpeg.c |    2 +-
>> >  1 file changed, 1 insertion(+), 1 deletion(-)
>> > 5a59a8ef62b4bfcde812f8ce81aee5c0f39c02db  0001-ffmpeg-Do-not-print-SDP-on-top-of-sdp-files.patch
>> > From ab80ef51e9ea87a3d3d0796aabd23b4bef85a4c3 Mon Sep 17 00:00:00 2001
>> > From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
>> > Date: Sun, 26 Jan 2020 21:47:26 +0100
>> > Subject: [PATCH] ffmpeg: Do not print "SDP:" on top of sdp files.
>> >
>> > Fixes ticket #7068.
>> > ---
>> >  fftools/ffmpeg.c | 2 +-
>> >  1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>> > diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
>> > index 6bcd7b94d2..d4ff30d6fb 100644
>> > --- a/fftools/ffmpeg.c
>> > +++ b/fftools/ffmpeg.c
>> > @@ -2776,7 +2776,7 @@ static void print_sdp(void)
>> >          if (avio_open2(&sdp_pb, sdp_filename, AVIO_FLAG_WRITE, &int_cb, NULL) < 0) {
>> >              av_log(NULL, AV_LOG_ERROR, "Failed to open sdp file '%s'\n", sdp_filename);
>> >          } else {
>> > -            avio_printf(sdp_pb, "SDP:\n%s", sdp);
>> > +            avio_printf(sdp_pb, "%s", sdp);

Not that it matters too much, but you can use avio_print(sdp_pb, sdp); 
here.

Regards,
Marton

>>
>> Are there any scripts/sw which expects this SDP prefix ?
>
> I don't know but it apparently contradicts the rfc and makes
> vlc fail on our sdp files.
>
> Carl Eugen
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Carl Eugen Hoyos Jan. 27, 2020, 9:48 p.m. UTC | #4 
Am Mo., 27. Jan. 2020 um 01:12 Uhr schrieb Marton Balint <cus@passwd.hu>:
>
>
>
> On Mon, 27 Jan 2020, Carl Eugen Hoyos wrote:
>
> > Am Mo., 27. Jan. 2020 um 00:45 Uhr schrieb Michael Niedermayer
> > <michael@niedermayer.cc>:
> >>
> >> On Sun, Jan 26, 2020 at 09:57:59PM +0100, Carl Eugen Hoyos wrote:
> >> > Hi!
> >> >
> >> > Attached patch is supposed to fix ticket #7068.
> >> >
> >> > Please comment, Carl Eugen
> >>
> >> >  ffmpeg.c |    2 +-
> >> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >> > 5a59a8ef62b4bfcde812f8ce81aee5c0f39c02db  0001-ffmpeg-Do-not-print-SDP-on-top-of-sdp-files.patch
> >> > From ab80ef51e9ea87a3d3d0796aabd23b4bef85a4c3 Mon Sep 17 00:00:00 2001
> >> > From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> >> > Date: Sun, 26 Jan 2020 21:47:26 +0100
> >> > Subject: [PATCH] ffmpeg: Do not print "SDP:" on top of sdp files.
> >> >
> >> > Fixes ticket #7068.
> >> > ---
> >> >  fftools/ffmpeg.c | 2 +-
> >> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >> >
> >> > diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
> >> > index 6bcd7b94d2..d4ff30d6fb 100644
> >> > --- a/fftools/ffmpeg.c
> >> > +++ b/fftools/ffmpeg.c
> >> > @@ -2776,7 +2776,7 @@ static void print_sdp(void)
> >> >          if (avio_open2(&sdp_pb, sdp_filename, AVIO_FLAG_WRITE, &int_cb, NULL) < 0) {
> >> >              av_log(NULL, AV_LOG_ERROR, "Failed to open sdp file '%s'\n", sdp_filename);
> >> >          } else {
> >> > -            avio_printf(sdp_pb, "SDP:\n%s", sdp);
> >> > +            avio_printf(sdp_pb, "%s", sdp);
>
> Not that it matters too much, but you can use avio_print(sdp_pb, sdp);
> here.

Applied with that change.

Thank you, Carl Eugen
diff mbox series

Patch

From ab80ef51e9ea87a3d3d0796aabd23b4bef85a4c3 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Date: Sun, 26 Jan 2020 21:47:26 +0100
Subject: [PATCH] ffmpeg: Do not print "SDP:" on top of sdp files.

Fixes ticket #7068.
---
 fftools/ffmpeg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 6bcd7b94d2..d4ff30d6fb 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -2776,7 +2776,7 @@  static void print_sdp(void)
         if (avio_open2(&sdp_pb, sdp_filename, AVIO_FLAG_WRITE, &int_cb, NULL) < 0) {
             av_log(NULL, AV_LOG_ERROR, "Failed to open sdp file '%s'\n", sdp_filename);
         } else {
-            avio_printf(sdp_pb, "SDP:\n%s", sdp);
+            avio_printf(sdp_pb, "%s", sdp);
             avio_closep(&sdp_pb);
             av_freep(&sdp_filename);
         }
-- 
2.24.1