August 2022 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/amr*bdec: return only number of consumed bytes
by Paul B Mahol 31 Aug '22

31 Aug '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Aug 31 18:36:04 2022 +0200| [319e8a49b5bcfa80fcb6f50f0dd78c6408c972ae] | committer: Paul B Mahol avcodec/amr*bdec: return only number of consumed bytes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=319e8a49b5bcfa80f… --- libavcodec/amrnbdec.c | 2 +- libavcodec/amrwbdec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/amrnbdec.c b/libavcodec/amrnbdec.c index dcf66c1dde..e07c01923e 100644 --- a/libavcodec/amrnbdec.c +++ b/libavcodec/amrnbdec.c @@ -1091,7 +1091,7 @@ static int amrnb_decode_frame(AVCodecContext *avctx, AVFrame *frame, *got_frame_ptr = 1; - return avpkt->size; + return buf - avpkt->data; } diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c index f9a67c43b7..1e537e1a3b 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -1288,7 +1288,7 @@ static int amrwb_decode_frame(AVCodecContext *avctx, AVFrame *frame, *got_frame_ptr = 1; - return avpkt->size; + return buf - avpkt->data; } const FFCodec ff_amrwb_decoder = {

1 0

[ffmpeg-web] branch master updated. 02eac90 web: Add FFmpeg 5.1.1
by ffmpeg-git＠ffmpeg.org 31 Aug '22

31 Aug '22

The branch, master has been updated via 02eac909118ae1f36d9b84425cd3b4d204365c62 (commit) from c4f43ba94252908a589a265d231c1ea6e3bea42d (commit) - Log ----------------------------------------------------------------- commit 02eac909118ae1f36d9b84425cd3b4d204365c62 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Wed Aug 31 21:31:36 2022 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Wed Aug 31 21:31:36 2022 +0200 web: Add FFmpeg 5.1.1 diff --git a/src/download b/src/download index dd4366b..ff874ef 100644 --- a/src/download +++ b/src/download @@ -304,10 +304,10 @@ gpg: Good signature from "FFmpeg release signing key <ffmpeg-devel(a)ffmpeg.org and much faster bug fixes such as additional features and security patches. </p> - <h3 id="release_5.1">FFmpeg 5.1 "Riemann"</h3> + <h3 id="release_5.1">FFmpeg 5.1.1 "Riemann"</h3> <p> - 5.1 was released on 2022-07-22. It is the latest stable FFmpeg release + 5.1.1 was released on 2022-08-31. It is the latest stable FFmpeg release from the 5.1 release branch, which was cut from master on 2022-07-13. </p> <p>It includes the following library versions: @@ -323,19 +323,19 @@ libswresample 4. 7.100 libpostproc 56. 6.100</pre> <div class="row"> <div class="col-md-3"> - <a class="btn btn-success" href="releases/ffmpeg-5.1.tar.xz">Download xz tarball</a> - <small><a href="releases/ffmpeg-5.1.tar.xz.asc">PGP signature</a></small> + <a class="btn btn-success" href="releases/ffmpeg-5.1.1.tar.xz">Download xz tarball</a> + <small><a href="releases/ffmpeg-5.1.1.tar.xz.asc">PGP signature</a></small> </div>  <div class="col-md-3"> - <a class="btn btn-success" href="releases/ffmpeg-5.1.tar.bz2">Download bzip2 tarball</a> - <small><a href="releases/ffmpeg-5.1.tar.bz2.asc">PGP signature</a></small> + <a class="btn btn-success" href="releases/ffmpeg-5.1.1.tar.bz2">Download bzip2 tarball</a> + <small><a href="releases/ffmpeg-5.1.1.tar.bz2.asc">PGP signature</a></small> </div>  <div class="col-md-3"> - <a class="btn btn-success" href="releases/ffmpeg-5.1.tar.gz">Download gzip tarball</a> - <small><a href="releases/ffmpeg-5.1.tar.gz.asc">PGP signature</a></small> + <a class="btn btn-success" href="releases/ffmpeg-5.1.1.tar.gz">Download gzip tarball</a> + <small><a href="releases/ffmpeg-5.1.1.tar.gz.asc">PGP signature</a></small> </div>  <div class="col-md-3 text-right"> - <small><a href="https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n5.1">Changelog</a></small> + <small><a href="https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n5.1.1">Changelog</a></small> <a class="btn btn-success" href="https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/5.1:/RELEA…">Release Notes</a> </div>  </div>  diff --git a/src/security b/src/security index 49ba720..7991405 100644 --- a/src/security +++ b/src/security @@ -1,5 +1,16 @@ <p>Please report vulnerabilities to <a href="mailto:ffmpeg-security@ffmpeg.org">ffmpeg-security(a)ffmpeg.org</a></p> + +<h2>FFmpeg 5.1</h2> + +<h3>5.1.1</h3> +<p> +Fixes following vulnerabilities: +</p> +<pre> +CVE-2022-2566, 6f53f0d09ea4c9c7f7354f018a87ef840315207d / c953baa084607dd1d84c3bfcce3cf6a87c3e6e05 +</pre> + <h2>FFmpeg 5.0</h2> <h3>5.0</h3> ----------------------------------------------------------------------- Summary of changes: src/download | 18 +++++++++--------- src/security | 11 +++++++++++ 2 files changed, 20 insertions(+), 9 deletions(-) hooks/post-receive --

1 0

Tag n5.1.1 : FFmpeg 5.1.1 release
by git＠videolan.org 31 Aug '22

31 Aug '22

[ffmpeg] [branch: refs/tags/n5.1.1] Tag: 8536e629f0c35c0e8a2b67e65d3bc60a088fe413 > http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=8536e629f0c35c0e8a2b6… Tagger: Michael Niedermayer <michael(a)niedermayer.cc> Date: Wed Aug 31 20:35:54 2022 +0200 FFmpeg 5.1.1 release

1 0

Update for 5.1.1
by Michael Niedermayer 31 Aug '22

31 Aug '22

ffmpeg | branch: release/5.1 | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Aug 31 18:10:03 2022 +0200| [1bad30dbe34f2d100b43e8f773d3fe0b5eb23523] | committer: Michael Niedermayer Update for 5.1.1 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1bad30dbe34f2d100… --- Changelog | 31 +++++++++++++++++++++++++++++++ RELEASE | 2 +- doc/Doxyfile | 2 +- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index d77bba51f6..0b32c1e410 100644 --- a/Changelog +++ b/Changelog @@ -1,6 +1,37 @@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. +version 5.1.1: +- avformat/asfdec_o: limit recursion depth in asf_read_unknown() +- avformat/mov: Check count sums in build_open_gop_key_points() +- doc/git-howto.texi: Document commit signing +- libavcodec/8bps: Check that line lengths fit within the buffer +- avcodec/midivid: Perform lzss_uncompress() before ff_reget_buffer() +- libavformat/iff: Check for overflow in body_end calculation +- avformat/avidec: Prevent entity expansion attacks +- avcodec/h263dec: Sanity check against minimal I/P frame size +- avcodec/hevcdec: Check s->ref in the md5 path similar to hwaccel +- avcodec/mpegaudiodec_template: use unsigned shift in handle_crc() +- avformat/subviewerdec: Make read_ts() more flexible +- avcodec/mjpegdec: bayer and rct are incompatible +- MAINTAINERS: Add ED25519 key for signing my commits in the future +- avcodec/pngdec: Fix APNG_DISPOSE_OP_BACKGROUND +- avcodec/libvpx: fix assembling vp9 packets with alpha channel +- fftools/ffmpeg_opt: try to propagate the requested output channel layout +- avcodec/libsvtav1: properly initialize the flush EbBufferHeaderType struct +- configure: enable the av1_frame_split bsf for the av1 decoder +- swresample/swresample: fill the correct buffer to print the output layout string +- ffprobe: restore reporting error code for failed inputs +- ipfsgateway: Remove default gateway +- avcodec/libspeexdec: Fix use of uninitialized value +- avformat/avisynth: use ch_layout.nb_channels for channel count +- fate/lavf-image: Disable file checksums for exr tests +- tests/fate-run: Allow to skip file checksums for lavf_image +- fate/imf: Rename IMF fate-target +- avcodec/alac: don't fail if channels aren't set during init() when extradata is valid +- configure: properly require libx264 if enabled + + version 5.1: - add ipfs/ipns protocol support - dialogue enhance audio filter diff --git a/RELEASE b/RELEASE index a75b92f1ed..ac14c3dfaa 100644 --- a/RELEASE +++ b/RELEASE @@ -1 +1 @@ -5.1 +5.1.1 diff --git a/doc/Doxyfile b/doc/Doxyfile index ba0002d5f8..4314fcebe6 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = FFmpeg # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 5.1 +PROJECT_NUMBER = 5.1.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a

1 0

avformat/asfdec_o: limit recursion depth in asf_read_unknown()
by Michael Niedermayer 31 Aug '22

31 Aug '22

ffmpeg | branch: release/5.1 | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Aug 31 01:21:38 2022 +0200| [5c0309d2788b946d05f50b2bcdb230c0cf2ae916] | committer: Michael Niedermayer avformat/asfdec_o: limit recursion depth in asf_read_unknown() The threshold of 5 is arbitrary, both smaller and larger should work fine Fixes: Stack overflow Fixes: 50603/clusterfuzz-testcase-minimized-ffmpeg_dem_ASF_O_fuzzer-6049302564175872 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 1f1a368169ef9d945dc4b4764f5c60ba9bbc9134) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c0309d2788b946d0… --- libavformat/asfdec_o.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index 907be6de04..48b7d17322 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -109,6 +109,7 @@ typedef struct ASFContext { int64_t data_offset; int64_t first_packet_offset; // packet offset int64_t unknown_offset; // for top level header objects or subobjects without specified behavior + int in_asf_read_unknown; // ASF file must not contain more than 128 streams according to the specification ASFStream *asf_st[ASF_MAX_STREAMS]; @@ -173,7 +174,7 @@ static int asf_read_unknown(AVFormatContext *s, const GUIDParseTable *g) uint64_t size = avio_rl64(pb); int ret; - if (size > INT64_MAX) + if (size > INT64_MAX || asf->in_asf_read_unknown > 5) return AVERROR_INVALIDDATA; if (asf->is_header) @@ -182,8 +183,11 @@ static int asf_read_unknown(AVFormatContext *s, const GUIDParseTable *g) if (!g->is_subobject) { if (!(ret = strcmp(g->name, "Header Extension"))) avio_skip(pb, 22); // skip reserved fields and Data Size - if ((ret = detect_unknown_subobject(s, asf->unknown_offset, - asf->unknown_size)) < 0) + asf->in_asf_read_unknown ++; + ret = detect_unknown_subobject(s, asf->unknown_offset, + asf->unknown_size); + asf->in_asf_read_unknown --; + if (ret < 0) return ret; } else { if (size < 24) {

1 0

avformat/asfdec_o: limit recursion depth in asf_read_unknown()
by Michael Niedermayer 31 Aug '22

31 Aug '22

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Aug 31 01:21:38 2022 +0200| [1f1a368169ef9d945dc4b4764f5c60ba9bbc9134] | committer: Michael Niedermayer avformat/asfdec_o: limit recursion depth in asf_read_unknown() The threshold of 5 is arbitrary, both smaller and larger should work fine Fixes: Stack overflow Fixes: 50603/clusterfuzz-testcase-minimized-ffmpeg_dem_ASF_O_fuzzer-6049302564175872 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f1a368169ef9d945… --- libavformat/asfdec_o.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index 907be6de04..48b7d17322 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -109,6 +109,7 @@ typedef struct ASFContext { int64_t data_offset; int64_t first_packet_offset; // packet offset int64_t unknown_offset; // for top level header objects or subobjects without specified behavior + int in_asf_read_unknown; // ASF file must not contain more than 128 streams according to the specification ASFStream *asf_st[ASF_MAX_STREAMS]; @@ -173,7 +174,7 @@ static int asf_read_unknown(AVFormatContext *s, const GUIDParseTable *g) uint64_t size = avio_rl64(pb); int ret; - if (size > INT64_MAX) + if (size > INT64_MAX || asf->in_asf_read_unknown > 5) return AVERROR_INVALIDDATA; if (asf->is_header) @@ -182,8 +183,11 @@ static int asf_read_unknown(AVFormatContext *s, const GUIDParseTable *g) if (!g->is_subobject) { if (!(ret = strcmp(g->name, "Header Extension"))) avio_skip(pb, 22); // skip reserved fields and Data Size - if ((ret = detect_unknown_subobject(s, asf->unknown_offset, - asf->unknown_size)) < 0) + asf->in_asf_read_unknown ++; + ret = detect_unknown_subobject(s, asf->unknown_offset, + asf->unknown_size); + asf->in_asf_read_unknown --; + if (ret < 0) return ret; } else { if (size < 24) {

1 0

lavc/ass: Add missing version.h include
by Carl Eugen Hoyos 31 Aug '22

31 Aug '22

ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg(a)gmail.com> | Wed Aug 31 16:25:31 2022 +0200| [4a054c3e97b4f30fe517114e381f9a2ee5a92f7c] | committer: Carl Eugen Hoyos lavc/ass: Add missing version.h include Fixes lavc version output in ass, regression since f2da2e14 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a054c3e97b4f30fe… --- libavcodec/ass.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/ass.c b/libavcodec/ass.c index a1e560d7ff..728cfb1ab5 100644 --- a/libavcodec/ass.c +++ b/libavcodec/ass.c @@ -24,6 +24,7 @@ #include "libavutil/avstring.h" #include "libavutil/bprint.h" #include "libavutil/common.h" +#include "version.h" int ff_ass_subtitle_header_full(AVCodecContext *avctx, int play_res_x, int play_res_y,

1 0

lavf/sdp: Add missing version.h include
by Carl Eugen Hoyos 31 Aug '22

31 Aug '22

ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg(a)gmail.com> | Wed Aug 31 16:24:22 2022 +0200| [7180416084cd9074e67a039992b43e5dc282fb81] | committer: Carl Eugen Hoyos lavf/sdp: Add missing version.h include Fixes lavf version output in SDP, regression since 4eb9232c > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7180416084cd9074e… --- libavformat/sdp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/sdp.c b/libavformat/sdp.c index 99a19852ff..6888936290 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -33,6 +33,7 @@ #include "avc.h" #include "hevc.h" #include "rtp.h" +#include "version.h" #if CONFIG_NETWORK #include "network.h" #endif

1 0

fftools/ffmpeg: use a separate counter for encoded packet data size
by Anton Khirnov 29 Aug '22

29 Aug '22

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Thu Aug 25 10:44:55 2022 +0200| [4fce3bab64699092100a65e957be4d1394c0b4d3] | committer: Anton Khirnov fftools/ffmpeg: use a separate counter for encoded packet data size update_video_stats() currently uses OutputStream.data_size to print the total size of the encoded stream so far and the average bitrate. However, that field is updated in the muxer thread, right before the packet is sent to the muxer. Not only is this racy, but the numbers may not match even if muxing was in the main thread due to bitstream filters, filesize limiting, etc. Introduce a new counter, data_size_enc, for total size of the packets received from the encoder and use that in update_video_stats(). Rename data_size to data_size_mux to indicate its semantics more clearly. No synchronization is needed for data_size_mux, because it is only read in the main thread in print_final_stats(), which runs after the muxer threads are terminated. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4fce3bab646990921… --- fftools/ffmpeg.c | 22 +++++++++++++--------- fftools/ffmpeg.h | 6 ++++-- fftools/ffmpeg_mux.c | 2 +- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 0ca07873b2..fbabbe6ea2 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -901,9 +901,9 @@ static void update_video_stats(OutputStream *ost, const AVPacket *pkt, int write ti1 = 0.01; bitrate = (pkt->size * 8) / av_q2d(enc->time_base) / 1000.0; - avg_bitrate = (double)(ost->data_size * 8) / ti1 / 1000.0; + avg_bitrate = (double)(ost->data_size_enc * 8) / ti1 / 1000.0; fprintf(vstats_file, "s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ", - (double)ost->data_size / 1024, ti1, bitrate, avg_bitrate); + (double)ost->data_size_enc / 1024, ti1, bitrate, avg_bitrate); fprintf(vstats_file, "type= %c\n", av_get_picture_type_char(ost->pict_type)); } @@ -979,6 +979,8 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame) av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, &enc->time_base)); } + ost->data_size_enc += pkt->size; + if (enc->codec_type == AVMEDIA_TYPE_VIDEO) update_video_stats(ost, pkt, !!vstats_filename); @@ -1454,14 +1456,16 @@ static void print_final_stats(int64_t total_size) for (i = 0; i < nb_output_streams; i++) { OutputStream *ost = output_streams[i]; AVCodecParameters *par = ost->st->codecpar; + const uint64_t s = ost->data_size_mux; + switch (par->codec_type) { - case AVMEDIA_TYPE_VIDEO: video_size += ost->data_size; break; - case AVMEDIA_TYPE_AUDIO: audio_size += ost->data_size; break; - case AVMEDIA_TYPE_SUBTITLE: subtitle_size += ost->data_size; break; - default: other_size += ost->data_size; break; + case AVMEDIA_TYPE_VIDEO: video_size += s; break; + case AVMEDIA_TYPE_AUDIO: audio_size += s; break; + case AVMEDIA_TYPE_SUBTITLE: subtitle_size += s; break; + default: other_size += s; break; } extra_size += par->extradata_size; - data_size += ost->data_size; + data_size += s; if (ost->enc_ctx && (ost->enc_ctx->flags & (AV_CODEC_FLAG_PASS1 | AV_CODEC_FLAG_PASS2)) != AV_CODEC_FLAG_PASS1) @@ -1529,7 +1533,7 @@ static void print_final_stats(int64_t total_size) OutputStream *ost = output_streams[of->ost_index + j]; enum AVMediaType type = ost->st->codecpar->codec_type; - total_size += ost->data_size; + total_size += ost->data_size_mux; total_packets += atomic_load(&ost->packets_written); av_log(NULL, AV_LOG_VERBOSE, " Output stream #%d:%d (%s): ", @@ -1543,7 +1547,7 @@ static void print_final_stats(int64_t total_size) } av_log(NULL, AV_LOG_VERBOSE, "%"PRIu64" packets muxed (%"PRIu64" bytes); ", - atomic_load(&ost->packets_written), ost->data_size); + atomic_load(&ost->packets_written), ost->data_size_mux); av_log(NULL, AV_LOG_VERBOSE, "\n"); } diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 74bc9220fc..ede0b2bd96 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -585,8 +585,10 @@ typedef struct OutputStream { int keep_pix_fmt; /* stats */ - // combined size of all the packets written - uint64_t data_size; + // combined size of all the packets sent to the muxer + uint64_t data_size_mux; + // combined size of all the packets received from the encoder + uint64_t data_size_enc; // number of packets send to the muxer atomic_uint_least64_t packets_written; // number of frames/samples sent to the encoder diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index b424ef0021..b781e1f5a6 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -156,7 +156,7 @@ static int write_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) } ms->last_mux_dts = pkt->dts; - ost->data_size += pkt->size; + ost->data_size_mux += pkt->size; atomic_fetch_add(&ost->packets_written, 1); pkt->stream_index = ost->index;

1 0

fftools/ffmpeg: drop OutputStream.fps_mode
by Anton Khirnov 29 Aug '22

29 Aug '22

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Thu Aug 25 10:08:41 2022 +0200| [0dd7347963041667e07366c83460fda8f19f4037] | committer: Anton Khirnov fftools/ffmpeg: drop OutputStream.fps_mode It is only used within new_video_stream(), so make it a local variable there. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0dd7347963041667e… --- fftools/ffmpeg.h | 1 - fftools/ffmpeg_opt.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 937a65b8e8..74bc9220fc 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -528,7 +528,6 @@ typedef struct OutputStream { AVRational max_frame_rate; enum VideoSyncMethod vsync_method; int is_cfr; - const char *fps_mode; int force_fps; int top_field_first; int rotate_overridden; diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 296751e19d..b387684daf 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1875,7 +1875,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in if (ost->enc_ctx) { AVCodecContext *video_enc = ost->enc_ctx; - const char *p = NULL; + const char *p = NULL, *fps_mode = NULL; char *frame_size = NULL; char *frame_pix_fmt = NULL; char *intra_matrix = NULL, *inter_matrix = NULL; @@ -2027,9 +2027,9 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in MATCH_PER_STREAM_OPT(top_field_first, i, ost->top_field_first, oc, st); ost->vsync_method = video_sync_method; - MATCH_PER_STREAM_OPT(fps_mode, str, ost->fps_mode, oc, st); - if (ost->fps_mode) - parse_and_set_vsync(ost->fps_mode, &ost->vsync_method, ost->file_index, ost->index, 0); + MATCH_PER_STREAM_OPT(fps_mode, str, fps_mode, oc, st); + if (fps_mode) + parse_and_set_vsync(fps_mode, &ost->vsync_method, ost->file_index, ost->index, 0); if (ost->vsync_method == VSYNC_AUTO) { if (!strcmp(oc->oformat->name, "avi")) {

1 0