Re: [FFmpeg-devel] [PATCH] ffmpeg: explicitly write headers for files with no streams

2016-10-07 Thread Michael Niedermayer
On Fri, Oct 07, 2016 at 03:46:14PM +0200, Hendrik Leppkes wrote:
> Recent changes to ffmpeg.c tied output file init to stream init, which broke
> stream-less files, specifically ffmetadata output.
> ---
>  ffmpeg.c | 10 ++
>  1 file changed, 10 insertions(+)

LGTM

thx

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Freedom in capitalist society always remains about the same as it was in
ancient Greek republics: Freedom for slave owners. -- Vladimir Lenin


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


Re: [FFmpeg-devel] [PATCH] ffmpeg: explicitly write headers for files with no streams

2016-10-07 Thread Hendrik Leppkes
On Fri, Oct 7, 2016 at 3:46 PM, Hendrik Leppkes  wrote:
> Recent changes to ffmpeg.c tied output file init to stream init, which broke
> stream-less files, specifically ffmetadata output.
> ---
>  ffmpeg.c | 10 ++
>  1 file changed, 10 insertions(+)
>
> diff --git a/ffmpeg.c b/ffmpeg.c
> index 454e193..b3e23ef 100644
> --- a/ffmpeg.c
> +++ b/ffmpeg.c
> @@ -3460,6 +3460,16 @@ static int transcode_init(void)
>  }
>  }
>
> +/* write headers for files with no streams */
> +for (i = 0; i < nb_output_files; i++) {
> +oc = output_files[i]->ctx;
> +if (oc->oformat->flags & AVFMT_NOSTREAMS) {

Locally added a check here that nb_streams is actually 0, because
AVFMT_NOSTREAMS doesn't forbid having streams, just allows zero.
Once it has a single stream, its initialized with the stream.

> +ret = check_init_output_file(output_files[i], i);
> +if (ret < 0)
> +goto dump_format;
> +}
> +}
> +
>   dump_format:
>  /* dump the stream mapping */
>  av_log(NULL, AV_LOG_INFO, "Stream mapping:\n");
> --
> 2.10.0.windows.1
>
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


[FFmpeg-devel] [PATCH] ffmpeg: explicitly write headers for files with no streams

2016-10-07 Thread Hendrik Leppkes
Recent changes to ffmpeg.c tied output file init to stream init, which broke
stream-less files, specifically ffmetadata output.
---
 ffmpeg.c | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/ffmpeg.c b/ffmpeg.c
index 454e193..b3e23ef 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3460,6 +3460,16 @@ static int transcode_init(void)
 }
 }
 
+/* write headers for files with no streams */
+for (i = 0; i < nb_output_files; i++) {
+oc = output_files[i]->ctx;
+if (oc->oformat->flags & AVFMT_NOSTREAMS) {
+ret = check_init_output_file(output_files[i], i);
+if (ret < 0)
+goto dump_format;
+}
+}
+
  dump_format:
 /* dump the stream mapping */
 av_log(NULL, AV_LOG_INFO, "Stream mapping:\n");
-- 
2.10.0.windows.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel