forked from pool/ffmpeg-5
- Update to version 5.1.3:
* avcodec/012v: Order operations for odd size handling
* avcodec/alsdec:
- Check bits left before block decoding in non multi channel
coding loop
- The minimal block is at least 7 bits
* avcodec/atrac3plus: reorder channels to match the output layout
* avcodec/audiotoolboxenc: return AVERROR_EXTERNAL immediately
when encode error
* avcodec/bink:
- Avoid undefined out of array end pointers in
binkb_decode_plane()
- Fix off by 1 error in ref end
* avcodec/eac3dec: avoid float noise in fixed mode addition to
overflow
* avcodec/eatgq: : Check index increments in tgq_decode_block()
* avcodec/escape124:
- Fix signdness of end of input check
- Fix some return codes
* avcodec/ffv1dec:
- Check that num h/v slices is supported
- Fail earlier if prior context is corrupted
* avcodec/ffv1dec: restructure slice coordinate reading a bit
* avcodec/h274: fix include
* avcodec/libjxldec:
- Fix gamma22 and gamma28 recognition
- Avoid hard failure with unspecified primaries
* avcodec/mjpegenc: take into account component count when
writing the SOF header size
* avcodec/mlpdec: Check max matrix instead of max channel in
noise check
* avcodec/motionpixels: Mask pixels to valid values
* avcodec/mpeg12dec:
- Check input size
- Use init_get_bits8 and check the return value
* avcodec/nvenc: fix vbv buffer size in cq mode
* avcodec/pictordec: Remove mid exit branch
* avcodec/pngdec:
- Check deloco index more exactly
- Dont skip/read chunk twice
* avcodec/rpzaenc: stop accessing out of bounds frame
* avcodec/scpr3: Check bx
* avcodec/scpr: Test bx before use
* avcodec/smcenc: stop accessing out of bounds frame
* avcodec/snowenc: Fix visual weight calculation
* avcodec/speedhq: Check buf_size to be big enough for DC
* avcodec/speexdec: Check channels > 2
* avcodec/sunrast: Fix maplength check
* avcodec/tests/snowenc:
- Fix 2nd test
- Return a failure if DWT/IDWT mismatches
- Unbreak DWT tests
* avcodec/tiff: Ignore tile_count
* avcodec/utils:
- Allocate a line more for VC1 and WMV3
- Ensure linesize for SVQ3
- Use 32pixel alignment for bink
* avcodec/videodsp_template: Adjust pointers to avoid undefined
pointer things
* avcodec/wavpack:
- Avoid undefined shift in get_tail()
- Check for end of input in wv_unpack_dsd_high()
* avcodec/xpmdec: Check size before allocation to avoid
truncation
* avcodec/aacdec: fix parsing streams with channel configuration
11
* avformat/id3v2: Check taglen in read_uslt()
* avformat/mov: Check samplesize and offset to avoid integer
overflow
* avformat/mxfdec: Use 64bit in remainder
* avformat/replaygain: avoid undefined / negative abs
* avformat/vividas: Check packet size
* avutil/tx: Use unsigned in ff_tx_fft_sr_combine() to avoid
undefined behavior
* hwcontext_vulkan: remove optional encode/decode extensions from
the list
* lavf/async: Fix ring_write return value
* lavu/vulkan: fix handle type for 32-bit targets
* libswscale: force a minimum size of the slide for bayer sources
* swscale/input: Use more unsigned intermediates
* swscale/output:
- Bias 16bps output calculations to improve non overflowing
range
- Bias 16bps output calculations to improve non overflowing
range for GBRP16/GBRPF32
* swscale: aarch64: Fix yuv2rgb with negative strides
* Use https for repository links
* vulkan: Fix win/i386 calling convention
- Rebase patches with quilt.
- Drop ffmpeg-CVE-2022-3964.patch: Fixed upstream.
- Drop no-vk-video-decoding.patch: Upstream removed this optional
code.
- Use ldconfig_scriptlets macro.
OBS-URL: https://build.opensuse.org/request/show/1080435
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-5?expand=0&rev=67
61 lines
3.1 KiB
Diff
61 lines
3.1 KiB
Diff
From: Jan Engelhardt <jengelh@inai.de>
|
|
Date: 2016-04-10 23:23:53.138440254 +0200
|
|
|
|
Improve the error messages a bit to say what's really going on
|
|
(in light of openSUSE's reduced build).
|
|
|
|
---
|
|
fftools/ffmpeg.c | 2 +-
|
|
fftools/ffmpeg_filter.c | 4 ++--
|
|
fftools/ffmpeg_opt.c | 2 +-
|
|
3 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
Index: ffmpeg-5.1.3/fftools/ffmpeg.c
|
|
===================================================================
|
|
--- ffmpeg-5.1.3.orig/fftools/ffmpeg.c
|
|
+++ ffmpeg-5.1.3/fftools/ffmpeg.c
|
|
@@ -2606,7 +2606,7 @@ static int init_input_stream(int ist_ind
|
|
if (ist->decoding_needed) {
|
|
const AVCodec *codec = ist->dec;
|
|
if (!codec) {
|
|
- snprintf(error, error_len, "Decoder (codec %s) not found for input stream #%d:%d",
|
|
+ snprintf(error, error_len, "This build of ffmpeg does not include a \"%s\" decoder needed for input stream #%d:%d.",
|
|
avcodec_get_name(ist->dec_ctx->codec_id), ist->file_index, ist->st->index);
|
|
return AVERROR(EINVAL);
|
|
}
|
|
Index: ffmpeg-5.1.3/fftools/ffmpeg_filter.c
|
|
===================================================================
|
|
--- ffmpeg-5.1.3.orig/fftools/ffmpeg_filter.c
|
|
+++ ffmpeg-5.1.3/fftools/ffmpeg_filter.c
|
|
@@ -945,7 +945,7 @@ static int configure_input_filter(Filter
|
|
{
|
|
if (!ifilter->ist->dec) {
|
|
av_log(NULL, AV_LOG_ERROR,
|
|
- "No decoder for stream #%d:%d, filtering impossible\n",
|
|
+ "This build of ffmpeg does not have a suitable decoder for stream #%d:%d enabled, filtering impossible\n",
|
|
ifilter->ist->file_index, ifilter->ist->st->index);
|
|
return AVERROR_DECODER_NOT_FOUND;
|
|
}
|
|
@@ -1117,7 +1117,7 @@ int configure_filtergraph(FilterGraph *f
|
|
if (!ost->enc) {
|
|
/* identical to the same check in ffmpeg.c, needed because
|
|
complex filter graphs are initialized earlier */
|
|
- av_log(NULL, AV_LOG_ERROR, "Encoder (codec %s) not found for output stream #%d:%d\n",
|
|
+ av_log(NULL, AV_LOG_ERROR, "This build of ffmpeg does not include a \"%s\" encoder needed for output stream #%d:%d.\n",
|
|
avcodec_get_name(ost->st->codecpar->codec_id), ost->file_index, ost->index);
|
|
ret = AVERROR(EINVAL);
|
|
goto fail;
|
|
Index: ffmpeg-5.1.3/fftools/ffmpeg_opt.c
|
|
===================================================================
|
|
--- ffmpeg-5.1.3.orig/fftools/ffmpeg_opt.c
|
|
+++ ffmpeg-5.1.3/fftools/ffmpeg_opt.c
|
|
@@ -1497,7 +1497,7 @@ static int choose_encoder(OptionsContext
|
|
if (!ost->enc) {
|
|
av_log(NULL, AV_LOG_FATAL, "Automatic encoder selection failed for "
|
|
"output stream #%d:%d. Default encoder for format %s (codec %s) is "
|
|
- "probably disabled. Please choose an encoder manually.\n",
|
|
+ "probably disabled or this build of ffmpeg does not include that codec. Please choose an encoder manually.\n",
|
|
ost->file_index, ost->index, s->oformat->name,
|
|
avcodec_get_name(ost->st->codecpar->codec_id));
|
|
return AVERROR_ENCODER_NOT_FOUND;
|