]>
git.sesse.net Git - ffmpeg/log
Andreas Cadhalpun [Tue, 12 May 2015 19:45:42 +0000 (21:45 +0200)]
imgutils: initialize palette padding bytes in av_image_alloc
av_image_fill_pointers always aligns the palette, but the padding
bytes don't (and can't) get initialized in av_image_copy.
Thus initialize them in av_image_alloc.
This fixes 'Syscall param write(buf) points to uninitialised byte(s)'
valgrind warnings.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Tue, 12 May 2015 20:06:22 +0000 (22:06 +0200)]
aacdec: remove a duplicated line
got_frame_ptr is set again after the if block.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 May 2015 17:59:37 +0000 (19:59 +0200)]
avfilter/vf_zoompan: free out AVFrame on failure
Fixes: CID1197065
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 May 2015 23:31:15 +0000 (01:31 +0200)]
avcodec/hevc_sei: Check num_sps_ids_minus1 value
Fixes CID1271794
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 May 2015 22:41:38 +0000 (00:41 +0200)]
avcodec/vqavideo: Check chunk size
Fixes CID1239154
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Tue, 12 May 2015 18:27:21 +0000 (20:27 +0200)]
aacdec: don't return frames without data
Since commit
676a395a aac->frame->data is not necessarily allocated at
the end of aac_decode_frame_int if avctx->channels is 0.
In this case a bogus frame without any data, but non-zero nb_samples is
returned.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 May 2015 18:31:21 +0000 (20:31 +0200)]
avfilter/avf_showcqt: Fix gamma comparisons
Fixes CID1297587, CID1297586,
1297585
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 May 2015 18:19:47 +0000 (20:19 +0200)]
avfilter/vf_cover_rect: Handle the case where the cover rectangle is as large as the input
Fixes division by 0
Fixes CID1297575
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 May 2015 18:08:18 +0000 (20:08 +0200)]
avfilter/vf_fftfilt: Add MAX_PLANES and change it to 4
The 4th planes is currently unused as no formats with alpha are supported yet
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 May 2015 17:28:15 +0000 (19:28 +0200)]
avformat/hevc: Check num_negative_pics and num_positive_pics
Fixes CID1238994
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 May 2015 17:09:06 +0000 (19:09 +0200)]
avformat/hevc: Check cpb_cnt_minus1
Fixes CID1239014
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 May 2015 17:03:18 +0000 (19:03 +0200)]
avformat/hls: Handle read_buffer allocation failure
Fixes CID1297576
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 May 2015 16:40:16 +0000 (18:40 +0200)]
avformat/idcin: Remove redundant chunk size check
Fixes CID1138438
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 May 2015 16:32:12 +0000 (18:32 +0200)]
avformat/matroskadec: Cleanup error handling for bz2 & zlib
Fixes CID703652
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 May 2015 16:20:23 +0000 (18:20 +0200)]
avformat/nutdec: Fix use of uinitialized value
Fixes CID1041175
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 May 2015 16:07:32 +0000 (18:07 +0200)]
avformat/rtpdec_xiph: Move pkt_len onto one side of the check
This is more correct
Fixes CID1271793
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 May 2015 16:03:55 +0000 (18:03 +0200)]
avformat/rtpdec_xiph: Check upper bound on len in xiph_handle_packet()
Larger packets are not supported and would cause problems later
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 May 2015 15:55:40 +0000 (17:55 +0200)]
avformat/rtpenc_jpeg: Check remaining buffer size for SOS
Fixes CID1238818
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 May 2015 11:36:54 +0000 (13:36 +0200)]
avformat/riffenc: Use size_t for strlen in ff_riff_write_info_tag()
Also dont generated corrupted output for larger than 4gb strings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 12 May 2015 12:02:49 +0000 (12:02 +0000)]
avfilter/af_aphaser: reject too small delay
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Marton Balint [Tue, 12 May 2015 00:22:02 +0000 (02:22 +0200)]
lavf/img2dec: add option to disable pattern matching
Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 May 2015 22:44:14 +0000 (00:44 +0200)]
fate: Test pullup and fieldmatch with 5 instead of 1 frame
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 May 2015 10:16:07 +0000 (12:16 +0200)]
Merge commit '
da5c6a97bbfe34d4b30a89e72150dd400299ddce '
* commit '
da5c6a97bbfe34d4b30a89e72150dd400299ddce ':
riff: Add MultiScope II fourcc MSC2 as MJPEG
See:
e31cdb5cc8080e164c66838a69f37f60f2d0ea82
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 May 2015 10:06:35 +0000 (12:06 +0200)]
Merge commit '
0670acc4f1c4ceb16968818a654e07a3f550a8c9 '
* commit '
0670acc4f1c4ceb16968818a654e07a3f550a8c9 ':
dca_parser: Extend DTS core sync word and fix existing check
Conflicts:
libavcodec/dca_parser.c
See:
e80b2b9c81716a5d9f559c04cfe69d76b04e4cd3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 May 2015 01:59:30 +0000 (03:59 +0200)]
tools/graph2dot: use larger data types than int for array/string sizes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 May 2015 01:20:49 +0000 (03:20 +0200)]
avformat/internal: Fix warning about struct declaration
Moving ffio_open2_wrapper() to internal as it uses AVFormatContext
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 8 May 2015 14:39:23 +0000 (15:39 +0100)]
riff: Add MultiScope II fourcc MSC2 as MJPEG
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
foo86 [Wed, 29 Apr 2015 08:14:55 +0000 (11:14 +0300)]
dca_parser: Extend DTS core sync word and fix existing check
The previous version checked for 14-bit streams and did not properly
work across buffer boundaries.
Use the 64-bit parser state to make extended sync word detection work
across buffer boundary and check the extended sync word for 16-bit LE
and BE core streams to reduce probability of alias sync detection.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 11 May 2015 22:52:03 +0000 (00:52 +0200)]
avcodec/hevc: Fix order of operations in hls_decode_neighbour()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 May 2015 20:38:21 +0000 (22:38 +0200)]
avformat/mlvdec: Use AVFormatContext->open_cb()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 May 2015 20:33:48 +0000 (22:33 +0200)]
avformat/avformat: slightly more verbose documentation for open_cb()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 May 2015 15:45:42 +0000 (17:45 +0200)]
avformat/mov: Use open_cb() if set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 May 2015 15:45:13 +0000 (17:45 +0200)]
avformat: add callback for opening further files
Previous version reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Mon, 11 May 2015 18:07:49 +0000 (20:07 +0200)]
id3v2: catch avio_read errors in check_tag
Since len is an unsigned int, the comparison is currently treated as
unsigned and thus ignores all errors from avio_read.
Thus cast len to int, which is unproblematic, because at that point len
is between 0 and 4.
This fixes 'Conditional jump or move depends on uninitialised value'
valgrind warnings in is_tag.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 May 2015 18:01:15 +0000 (20:01 +0200)]
avutil/avstring: Use size_t in av_strlcatf()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 May 2015 15:28:25 +0000 (17:28 +0200)]
avformat/mov: Pass MovContext into mov_open_dref()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gopu Govindaswamy [Thu, 7 May 2015 08:58:55 +0000 (14:28 +0530)]
avcodec/libx265: use x265 Multi-library Interface to query the API
ffmpeg can now use the x265 multi-library interface to make a runtime
selection between a number of libx265 libraries (perhaps 8bpp and 16bpp).
ffmpeg will link to one build of libx265 (statically or
dynamically) and this linked version of libx265 will support one
bit-depth (8 or 10 bits). At runtime, ffmpeg now has the option to request the
encoder to use a different bit depth(8 or 10). If the requested bitdepth
is zero, or if it matches the bitdepth of the system default libx265 (the
currently linked library), then this library will be used for encode.
If ffmpeg requests a different bit-depth, the linked libx265 will attempt
to dynamically bind a shared library with the requested bit-depth from the install
location (default or user-specified).
new x265 API:
const x265_api* api = x265_api_get(int bitDepth);
x265_api - holds the libx265 public API functions
bitDepth - requested API for 8bpp or 16bpp
note: Use 0 to indicate native bit depth of the linked libx265 and
x265_api_get(0) is guaranteed to return a non-null pointer
Signed-off-by: Gopu Govindaswamy <gopu@multicorewareinc.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Mon, 11 May 2015 13:39:35 +0000 (15:39 +0200)]
avformat/vorbiscomment: Use 64bit int for ff_vorbiscomment_length()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 May 2015 13:37:38 +0000 (15:37 +0200)]
avformat/matroskaenc: Check ff_vorbiscomment_length in put_flac_codecpriv()
Its currently guaranteed to be smaller but its safer to check anyway
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 May 2015 13:34:28 +0000 (15:34 +0200)]
avformat/oggenc: Check ff_vorbiscomment_length in ogg_write_vorbiscomment()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 May 2015 13:30:32 +0000 (15:30 +0200)]
avformat/flacenc: Check length in flac_write_block_comment()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 May 2015 13:23:51 +0000 (15:23 +0200)]
avformat/vorbiscomment: Check entry length in ff_vorbiscomment_write()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 May 2015 13:38:40 +0000 (15:38 +0200)]
avformat/subtitles: Use size_t for len
string length could theoretically be larger than int
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 May 2015 01:51:17 +0000 (03:51 +0200)]
avformat/matroskadec: Use size_t for the variable holding a strlen() value.
Should make no difference but is more correct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 May 2015 01:50:01 +0000 (03:50 +0200)]
avformat/url: Use size_t for len from strlen()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 May 2015 23:56:02 +0000 (01:56 +0200)]
Merge commit '
b8d2630c5327d2818d05c8a48be0417905d8e0fd '
* commit '
b8d2630c5327d2818d05c8a48be0417905d8e0fd ':
dashenc: Reduce the segment duration if cutting out parts with edit lists
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 May 2015 23:46:24 +0000 (01:46 +0200)]
Merge commit '
ac1a1cb948fe29975424e367173b88db48792144 '
* commit '
ac1a1cb948fe29975424e367173b88db48792144 ':
dashenc: replace attribute id with contentType for the AdaptationSet element
See:
32a4177a627ddce984a5a9ed7023d9a63dcbdf85
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sun, 10 May 2015 06:31:44 +0000 (03:31 -0300)]
dashenc: replace attribute id with contentType for the AdaptationSet element
id should be an integer, not a string. It is also optional, so use
contentType instead which is the proper attribute for these values.
This addresses ticket #4545, fixing an MPD validation error.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 May 2015 21:32:11 +0000 (23:32 +0200)]
fate: Use more than 5 frames for testing select and idet filters
Testing these filters with just 5 frames could potentially be
insufficient
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 May 2015 21:01:08 +0000 (23:01 +0200)]
Merge commit '
2fb02ecfd115a627f22df21720aa0bd4f6fcee8b '
* commit '
2fb02ecfd115a627f22df21720aa0bd4f6fcee8b ':
fate: Reduce the number of frames used to test video filters
Conflicts:
tests/fate-run.sh
tests/ref/fate/filter-crop
tests/ref/fate/filter-crop_scale
tests/ref/fate/filter-crop_scale_vflip
tests/ref/fate/filter-crop_vflip
tests/ref/fate/filter-null
tests/ref/fate/filter-pixdesc-abgr
tests/ref/fate/filter-pixdesc-argb
tests/ref/fate/filter-pixdesc-bgr24
tests/ref/fate/filter-pixdesc-bgr444be
tests/ref/fate/filter-pixdesc-bgr444le
tests/ref/fate/filter-pixdesc-bgr48be
tests/ref/fate/filter-pixdesc-bgr48le
tests/ref/fate/filter-pixdesc-bgr4_byte
tests/ref/fate/filter-pixdesc-bgr555be
tests/ref/fate/filter-pixdesc-bgr555le
tests/ref/fate/filter-pixdesc-bgr565be
tests/ref/fate/filter-pixdesc-bgr565le
tests/ref/fate/filter-pixdesc-bgr8
tests/ref/fate/filter-pixdesc-bgra
tests/ref/fate/filter-pixdesc-gbrap
tests/ref/fate/filter-pixdesc-gbrp
tests/ref/fate/filter-pixdesc-gbrp10be
tests/ref/fate/filter-pixdesc-gbrp10le
tests/ref/fate/filter-pixdesc-gbrp9be
tests/ref/fate/filter-pixdesc-gbrp9le
tests/ref/fate/filter-pixdesc-gray
tests/ref/fate/filter-pixdesc-gray16be
tests/ref/fate/filter-pixdesc-gray16le
tests/ref/fate/filter-pixdesc-monob
tests/ref/fate/filter-pixdesc-monow
tests/ref/fate/filter-pixdesc-nv12
tests/ref/fate/filter-pixdesc-nv21
tests/ref/fate/filter-pixdesc-rgb24
tests/ref/fate/filter-pixdesc-rgb444be
tests/ref/fate/filter-pixdesc-rgb444le
tests/ref/fate/filter-pixdesc-rgb48be
tests/ref/fate/filter-pixdesc-rgb48le
tests/ref/fate/filter-pixdesc-rgb4_byte
tests/ref/fate/filter-pixdesc-rgb555be
tests/ref/fate/filter-pixdesc-rgb555le
tests/ref/fate/filter-pixdesc-rgb565be
tests/ref/fate/filter-pixdesc-rgb565le
tests/ref/fate/filter-pixdesc-rgb8
tests/ref/fate/filter-pixdesc-rgba
tests/ref/fate/filter-pixdesc-uyvy422
tests/ref/fate/filter-pixdesc-yuv410p
tests/ref/fate/filter-pixdesc-yuv411p
tests/ref/fate/filter-pixdesc-yuv420p
tests/ref/fate/filter-pixdesc-yuv420p10be
tests/ref/fate/filter-pixdesc-yuv420p10le
tests/ref/fate/filter-pixdesc-yuv420p16be
tests/ref/fate/filter-pixdesc-yuv420p16le
tests/ref/fate/filter-pixdesc-yuv420p9be
tests/ref/fate/filter-pixdesc-yuv420p9le
tests/ref/fate/filter-pixdesc-yuv422p
tests/ref/fate/filter-pixdesc-yuv422p10be
tests/ref/fate/filter-pixdesc-yuv422p10le
tests/ref/fate/filter-pixdesc-yuv422p16be
tests/ref/fate/filter-pixdesc-yuv422p16le
tests/ref/fate/filter-pixdesc-yuv422p9be
tests/ref/fate/filter-pixdesc-yuv422p9le
tests/ref/fate/filter-pixdesc-yuv440p
tests/ref/fate/filter-pixdesc-yuv444p
tests/ref/fate/filter-pixdesc-yuv444p10be
tests/ref/fate/filter-pixdesc-yuv444p10le
tests/ref/fate/filter-pixdesc-yuv444p16be
tests/ref/fate/filter-pixdesc-yuv444p16le
tests/ref/fate/filter-pixdesc-yuv444p9be
tests/ref/fate/filter-pixdesc-yuv444p9le
tests/ref/fate/filter-pixdesc-yuva420p
tests/ref/fate/filter-pixdesc-yuva420p10be
tests/ref/fate/filter-pixdesc-yuva420p10le
tests/ref/fate/filter-pixdesc-yuva420p16be
tests/ref/fate/filter-pixdesc-yuva420p16le
tests/ref/fate/filter-pixdesc-yuva420p9be
tests/ref/fate/filter-pixdesc-yuva420p9le
tests/ref/fate/filter-pixdesc-yuva422p
tests/ref/fate/filter-pixdesc-yuva422p10be
tests/ref/fate/filter-pixdesc-yuva422p10le
tests/ref/fate/filter-pixdesc-yuva422p16be
tests/ref/fate/filter-pixdesc-yuva422p16le
tests/ref/fate/filter-pixdesc-yuva422p9be
tests/ref/fate/filter-pixdesc-yuva422p9le
tests/ref/fate/filter-pixdesc-yuva444p
tests/ref/fate/filter-pixdesc-yuva444p10be
tests/ref/fate/filter-pixdesc-yuva444p10le
tests/ref/fate/filter-pixdesc-yuva444p16be
tests/ref/fate/filter-pixdesc-yuva444p16le
tests/ref/fate/filter-pixdesc-yuva444p9be
tests/ref/fate/filter-pixdesc-yuva444p9le
tests/ref/fate/filter-pixdesc-yuvj420p
tests/ref/fate/filter-pixdesc-yuvj422p
tests/ref/fate/filter-pixdesc-yuvj440p
tests/ref/fate/filter-pixdesc-yuvj444p
tests/ref/fate/filter-pixdesc-yuyv422
tests/ref/fate/filter-pixdesc-yvyu422
tests/ref/fate/filter-pixfmts-copy
tests/ref/fate/filter-pixfmts-crop
tests/ref/fate/filter-pixfmts-hflip
tests/ref/fate/filter-pixfmts-null
tests/ref/fate/filter-pixfmts-pad
tests/ref/fate/filter-pixfmts-scale
tests/ref/fate/filter-pixfmts-vflip
tests/ref/fate/filter-scale200
tests/ref/fate/filter-scale500
tests/ref/fate/filter-vflip
tests/ref/fate/filter-vflip_crop
tests/ref/fate/filter-vflip_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 May 2015 20:50:22 +0000 (22:50 +0200)]
Merge commit '
379e5603f4131e677ecf5ba79973dcd5603f28ea '
* commit '
379e5603f4131e677ecf5ba79973dcd5603f28ea ':
id3v2: Do not export empty APIC description
Conflicts:
libavformat/id3v2.c
See:
b697b297b77f73c932307120e32c187d521d2ff7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 May 2015 20:42:23 +0000 (22:42 +0200)]
Merge commit '
b9f7a677083647d85e583d6d7384938766a293d7 '
* commit '
b9f7a677083647d85e583d6d7384938766a293d7 ':
png: Set the color range as full range
Conflicts:
libavcodec/pngdec.c
See:
72e7553125e61847d9cab77fb7de62440dca746b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 May 2015 20:30:43 +0000 (22:30 +0200)]
Merge commit '
254f3daba4271c1918d9a7ad155b1442ef93ed29 '
* commit '
254f3daba4271c1918d9a7ad155b1442ef93ed29 ':
nut: Make sure to clean up on read_header failure
Conflicts:
libavformat/nutdec.c
See:
361702660d2c37a63b7d6381d39e1e1de8405260
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 May 2015 20:19:01 +0000 (22:19 +0200)]
Michael Niedermayer [Sun, 10 May 2015 20:09:26 +0000 (22:09 +0200)]
Merge commit '
b34257eefd98cb768ea2f53a390b8684d51e689a '
* commit '
b34257eefd98cb768ea2f53a390b8684d51e689a ':
nut: Check chapter creation in decode_info_header
Conflicts:
libavformat/nutdec.c
See:
3ff1af2b0db7132d5717be6395227a94c8abab07
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 May 2015 20:00:02 +0000 (22:00 +0200)]
Merge commit '
243e8443cd9e83c887e3f5edf09a169e7783d14e '
* commit '
243e8443cd9e83c887e3f5edf09a169e7783d14e ':
alac: Reject rice_limit 0 if compression is used
Conflicts:
libavcodec/alac.c
See:
4b657a1b1eedcf38bcf36e89a2f4be6f76b5ce09
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sun, 10 May 2015 07:05:37 +0000 (10:05 +0300)]
dashenc: Reduce the segment duration if cutting out parts with edit lists
This makes sure that the time + duration of the first segment
matches the start time of the next segment for e.g. AAC audio
with encoder delay.
Signed-off-by: Martin Storsjö <martin@martin.st>
James Almer [Sun, 10 May 2015 06:33:37 +0000 (03:33 -0300)]
dashenc: replace attribute id with contentType for the AdaptationSet element
id should be an integer, not a string. It is also optional, so use
contentType instead which is the proper attribute for these values.
This fixes an MPD validation error.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sun, 10 May 2015 19:41:31 +0000 (21:41 +0200)]
Merge commit '
295e05a762332c5edcc84c325e94457815a51b5c '
* commit '
295e05a762332c5edcc84c325e94457815a51b5c ':
ape: Support _0000 files with nblock smaller than 64
Conflicts:
libavcodec/apedec.c
See:
699341d647f7af785fb8ceed67604467b0b9ab12
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 May 2015 17:54:41 +0000 (19:54 +0200)]
avformat/wavenc: Check umid length
Fixes potential out of array read
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 May 2015 17:52:30 +0000 (19:52 +0200)]
avformat/wavenc: fix string length variable types
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 May 2015 16:08:42 +0000 (18:08 +0200)]
avcodec/ppc/h264qpel_template: Fix alignment assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 May 2015 14:28:37 +0000 (16:28 +0200)]
postproc/postprocess: Use size_t to hold strlen()s value
This should make no difference but its more correct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 May 2015 14:26:58 +0000 (16:26 +0200)]
avformat/nutenc: Fix writing strings larger than 2gb
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 May 2015 14:09:07 +0000 (16:09 +0200)]
avutil/dict: Use size_t for appending strings
the string length is not constrained to INT_MAX
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 May 2015 14:06:50 +0000 (16:06 +0200)]
libavutil/mem: use size_t for the length in av_strdup()
the string length is not constrained to INT_MAX
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 May 2015 13:09:04 +0000 (15:09 +0200)]
swscale/x86/swscale: Fix warning about loosing significant bits in cast
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 May 2015 13:01:36 +0000 (15:01 +0200)]
avformat/http: Mark lower_proto as const in http_listen()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 May 2015 01:39:51 +0000 (03:39 +0200)]
avformat/mxf: Always evaluate PRINT_KEY() arguments at compile time
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 May 2015 01:38:43 +0000 (03:38 +0200)]
avformat/mxf: Simplify PRINT_KEY()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 May 2015 02:43:39 +0000 (04:43 +0200)]
avcodec/snowenc: set dia_size for the first pass of motion estimation too
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sat, 9 May 2015 21:44:30 +0000 (23:44 +0200)]
fate: Reduce the number of frames used to test video filters
Use 5 frames for video filter tests and a single one for the
pixelformat tests.
Greatly reduces the test duration without reducing coverage.
Reimar Döffinger [Sat, 9 May 2015 18:55:48 +0000 (20:55 +0200)]
avformat_alloc_context: initialize raw_packet_buffer_remaining_size.
This currently works for most users because
avformat_open_input sets it, but this patch fixes any
applications not using that function.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Sun, 10 May 2015 00:26:28 +0000 (02:26 +0200)]
avcodec/snowenc: correct fullpel search pattern
No real difference in quality, its a bit slower for the same dia_size as more
vectors are searched for the same dia_size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 May 2015 22:57:06 +0000 (00:57 +0200)]
avcodec/snowenc: Fix used reference MV in fullpel iterative ME
This very very slightly improves quality, no measurable speed change
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 May 2015 22:46:02 +0000 (00:46 +0200)]
avcodec/snowenc: change log level for iterative ME information to debug level
The printed stuff should be useless to the average user and its certainly
not an error.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 May 2015 21:43:43 +0000 (23:43 +0200)]
avcodec/snowenc: add intra_penalty AVOption
This allows favoring intra or inter blocks by a user specified amount.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 May 2015 14:20:12 +0000 (16:20 +0200)]
avcodec/mpegvideo: Fix null pointer dereference with grayscale decoding with mpeg2_field_encoding.ts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 May 2015 13:58:02 +0000 (15:58 +0200)]
avcodec/mpeg12dec: Fix "-flags +gray"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wm4 [Fri, 8 May 2015 16:19:12 +0000 (18:19 +0200)]
id3v2: Do not export empty APIC description
APIC tags always have a description. Tag writers obviously leave it
empty if there is no description. In this case, libavformat would export
"" as title. Do not set the title instead.
wm4 [Fri, 8 May 2015 15:01:50 +0000 (17:01 +0200)]
png: Set the color range as full range
The format uses full range for the gray formats.
CC: libav-stable@libav.org
Luca Barbato [Wed, 29 Apr 2015 19:29:49 +0000 (21:29 +0200)]
nut: Make sure to clean up on read_header failure
Based on Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> work.
CC: libav-stable@libav.org
Andreas Cadhalpun [Wed, 6 May 2015 00:26:57 +0000 (02:26 +0200)]
avi: Validate sample_size
And either error out or set it to 0 if it is negative.
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Sat, 9 May 2015 11:07:21 +0000 (13:07 +0200)]
cmdline: Check options array for not working flag combinations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 May 2015 11:07:00 +0000 (13:07 +0200)]
ffmpeg_opt: Fix -timestamp parsing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 May 2015 10:02:47 +0000 (12:02 +0200)]
avcodec/mpegvideo: Fix indention
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 May 2015 00:42:47 +0000 (02:42 +0200)]
avcodec/error_resilience: support grayscale
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 May 2015 23:36:53 +0000 (01:36 +0200)]
avcodec/mpegvideo: Fix -flags +gray with xvid_vlc_trac7411.h263
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 May 2015 23:10:25 +0000 (01:10 +0200)]
avcodec/h263dec: use PIX_FMT_GRAY8 when the user specified CODEC_FLAG_GRAY
Fixes Ticket4542
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 May 2015 22:27:00 +0000 (00:27 +0200)]
avdevice/v4l2: Try to fix build on netbsd/openbsd
Found-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Giorgio Vazzana [Fri, 8 May 2015 15:25:15 +0000 (17:25 +0200)]
lavd/v4l2: produce a 0 byte packet when a dequeued buffer is flagged with V4L2_BUF_FLAG_ERROR
Fixes ticket #4030.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 May 2015 16:50:28 +0000 (18:50 +0200)]
avcodec/vc1: Skip chroma operations if CODEC_FLAG_GRAY is set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Giorgio Vazzana [Fri, 8 May 2015 15:42:34 +0000 (17:42 +0200)]
lavd/v4l2: fix typo
This was introduced in
cde6e328de214ffe8387641cdc1e433a2c2150f3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Thu, 7 May 2015 12:37:37 +0000 (08:37 -0400)]
vp9: de-duplicate some functions that are identical between 10/12 bpp.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
周晓勇 [Fri, 8 May 2015 10:17:19 +0000 (18:17 +0800)]
configure: remove loongson check inline asm and mips dependent
1.Loongson now have two series CPU supported MMI(Multi-Media Instruct).
Loongson-3 designed multi-core have good performance in decoding.
Loongson-2's support is comming soon.
2.Replaced loongson with loongson2 and loongson3.
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
周晓勇 [Fri, 8 May 2015 10:16:14 +0000 (18:16 +0800)]
configure: replace arch loongson with arch extra list loongson
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Tue, 28 Apr 2015 18:57:59 +0000 (20:57 +0200)]
nut: Check chapter creation in decode_info_header
This fixes a segmentation fault when accessing the metadata.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
Andreas Cadhalpun [Thu, 23 Apr 2015 22:01:43 +0000 (00:01 +0200)]
alac: Reject rice_limit 0 if compression is used
If in compression mode rice_limit = 0 leads to call
`show_bits(gb, k)` in `decode_scalar` with k = 0.
Request a sample in case it is valid and it should be accepted.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
Andreas Cadhalpun [Wed, 29 Apr 2015 18:39:22 +0000 (20:39 +0200)]
ape: Support _0000 files with nblock smaller than 64
The decode_array_0000 assumed that 64 is the minimal block size
while it is not.
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
wm4 [Thu, 7 May 2015 21:56:36 +0000 (23:56 +0200)]
id3v2: do not export APIC description if empty
APIC tags always have a description. Tag writers obviously leave it
empty if there is no description. In this case, libavformat would export
"" as title. Do not set the title instead.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>