Michael Niedermayer
77ccc9145a
avformat/mov: Use open_cb() if set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 21:56:53 +02:00
Michael Niedermayer
541d75f9a0
avformat: add callback for opening further files
...
Previous version reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 21:55:18 +02:00
Andreas Cadhalpun
0382c94f13
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>
2015-05-11 20:21:48 +02:00
Michael Niedermayer
ae4eea8be4
avutil/avstring: Use size_t in av_strlcatf()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 20:01:15 +02:00
Michael Niedermayer
2b97cc2e5b
avformat/mov: Pass MovContext into mov_open_dref()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 18:12:24 +02:00
Gopu Govindaswamy
94c20de429
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>
2015-05-11 16:15:23 +01:00
Michael Niedermayer
ab6dc86343
avformat/vorbiscomment: Use 64bit int for ff_vorbiscomment_length()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 15:56:16 +02:00
Michael Niedermayer
66f26b3e8e
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>
2015-05-11 15:56:16 +02:00
Michael Niedermayer
0db5b2b9f8
avformat/oggenc: Check ff_vorbiscomment_length in ogg_write_vorbiscomment()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 15:56:16 +02:00
Michael Niedermayer
40a7700b82
avformat/flacenc: Check length in flac_write_block_comment()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 15:31:55 +02:00
Michael Niedermayer
eca38864a6
avformat/vorbiscomment: Check entry length in ff_vorbiscomment_write()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 15:23:51 +02:00
Michael Niedermayer
a633928d47
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>
2015-05-11 12:42:38 +02:00
Michael Niedermayer
17b26308a2
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>
2015-05-11 04:05:20 +02:00
Michael Niedermayer
95efc65129
avformat/url: Use size_t for len from strlen()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 03:50:01 +02:00
Michael Niedermayer
28b7d7a36d
Merge commit 'b8d2630c5327d2818d05c8a48be0417905d8e0fd'
...
* commit 'b8d2630c5327d2818d05c8a48be0417905d8e0fd':
dashenc: Reduce the segment duration if cutting out parts with edit lists
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 01:56:11 +02:00
Michael Niedermayer
ae99f06e5a
Merge commit 'ac1a1cb948fe29975424e367173b88db48792144'
...
* commit 'ac1a1cb948fe29975424e367173b88db48792144':
dashenc: replace attribute id with contentType for the AdaptationSet element
See: 32a4177a62
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 01:46:32 +02:00
James Almer
32a4177a62
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>
2015-05-11 01:37:39 +02:00
Michael Niedermayer
8d916ef5f7
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>
2015-05-10 23:32:11 +02:00
Michael Niedermayer
5e19651c9d
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>
2015-05-10 23:09:06 +02:00
Michael Niedermayer
1cf81a2c50
Merge commit '379e5603f4131e677ecf5ba79973dcd5603f28ea'
...
* commit '379e5603f4131e677ecf5ba79973dcd5603f28ea':
id3v2: Do not export empty APIC description
Conflicts:
libavformat/id3v2.c
See: b697b297b7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 22:51:38 +02:00
Michael Niedermayer
f230451b7a
Merge commit 'b9f7a677083647d85e583d6d7384938766a293d7'
...
* commit 'b9f7a677083647d85e583d6d7384938766a293d7':
png: Set the color range as full range
Conflicts:
libavcodec/pngdec.c
See: 72e7553125
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 22:42:56 +02:00
Michael Niedermayer
55231323b0
Merge commit '254f3daba4271c1918d9a7ad155b1442ef93ed29'
...
* commit '254f3daba4271c1918d9a7ad155b1442ef93ed29':
nut: Make sure to clean up on read_header failure
Conflicts:
libavformat/nutdec.c
See: 361702660d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 22:31:39 +02:00
Michael Niedermayer
73b8155b31
Merge commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81'
...
* commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81':
avi: Validate sample_size
Conflicts:
libavformat/avidec.c
See: ca234639ac
See: c7369f3a4b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 22:20:37 +02:00
Michael Niedermayer
8b0ceb96da
Merge commit 'b34257eefd98cb768ea2f53a390b8684d51e689a'
...
* commit 'b34257eefd98cb768ea2f53a390b8684d51e689a':
nut: Check chapter creation in decode_info_header
Conflicts:
libavformat/nutdec.c
See: 3ff1af2b0d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 22:09:48 +02:00
Michael Niedermayer
ce1c0e99e9
Merge commit '243e8443cd9e83c887e3f5edf09a169e7783d14e'
...
* commit '243e8443cd9e83c887e3f5edf09a169e7783d14e':
alac: Reject rice_limit 0 if compression is used
Conflicts:
libavcodec/alac.c
See: 4b657a1b1e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 22:00:40 +02:00
Martin Storsjö
b8d2630c53
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>
2015-05-10 22:57:21 +03:00
James Almer
ac1a1cb948
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>
2015-05-10 22:57:20 +03:00
Michael Niedermayer
918c5ea4d3
Merge commit '295e05a762332c5edcc84c325e94457815a51b5c'
...
* commit '295e05a762332c5edcc84c325e94457815a51b5c':
ape: Support _0000 files with nblock smaller than 64
Conflicts:
libavcodec/apedec.c
See: 699341d647
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 21:42:08 +02:00
Michael Niedermayer
004564c930
avformat/wavenc: Check umid length
...
Fixes potential out of array read
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 20:03:36 +02:00
Michael Niedermayer
ecb4ae7879
avformat/wavenc: fix string length variable types
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 19:52:30 +02:00
Michael Niedermayer
d0b294286c
avcodec/ppc/h264qpel_template: Fix alignment assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 18:09:39 +02:00
Michael Niedermayer
07cb6bf985
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>
2015-05-10 16:28:37 +02:00
Michael Niedermayer
d66b623ad0
avformat/nutenc: Fix writing strings larger than 2gb
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 16:26:58 +02:00
Michael Niedermayer
4c128ea162
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>
2015-05-10 16:09:07 +02:00
Michael Niedermayer
4950bd4ebe
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>
2015-05-10 16:06:50 +02:00
Michael Niedermayer
54e64eaf68
swscale/x86/swscale: Fix warning about loosing significant bits in cast
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 15:09:04 +02:00
Michael Niedermayer
a649f36f75
avformat/http: Mark lower_proto as const in http_listen()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 15:01:36 +02:00
Michael Niedermayer
3d65570f25
avformat/mxf: Always evaluate PRINT_KEY() arguments at compile time
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 14:39:27 +02:00
Michael Niedermayer
8b42b22222
avformat/mxf: Simplify PRINT_KEY()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 14:39:26 +02:00
Michael Niedermayer
729108515d
avcodec/snowenc: set dia_size for the first pass of motion estimation too
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 14:19:56 +02:00
Luca Barbato
2fb02ecfd1
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.
2015-05-10 13:49:30 +02:00
Reimar Döffinger
5af621278d
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>
2015-05-10 08:47:53 +02:00
Michael Niedermayer
58201c6e9e
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>
2015-05-10 02:38:05 +02:00
Michael Niedermayer
db6d0a5bd2
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>
2015-05-10 01:05:42 +02:00
Michael Niedermayer
f349703e1d
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>
2015-05-10 00:46:02 +02:00
Michael Niedermayer
b62297805b
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>
2015-05-09 23:52:36 +02:00
Michael Niedermayer
cf31e2df08
avcodec/mpegvideo: Fix null pointer dereference with grayscale decoding with mpeg2_field_encoding.ts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-09 17:10:26 +02:00
Michael Niedermayer
33529104e5
avcodec/mpeg12dec: Fix "-flags +gray"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-09 15:58:02 +02:00
wm4
379e5603f4
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.
2015-05-09 15:55:50 +02:00
wm4
b9f7a67708
png: Set the color range as full range
...
The format uses full range for the gray formats.
CC: libav-stable@libav.org
2015-05-09 15:55:50 +02:00