Michael Niedermayer
6b0f54ddc7
Merge commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa'
...
* commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa':
mpegts: Support running the write_trailer function without an AVIOContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
3a15168a6e
Merge commit '4895aa65c6ddec2e33ec3c023f221b1bafcbaf9f'
...
* commit '4895aa65c6ddec2e33ec3c023f221b1bafcbaf9f':
libavformat: Allow calling av_write_trailer with a NULL AVIOContext
Conflicts:
libavformat/mux.c
See: 277f20c3c8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Clément Bœsch
edbbb11488
avformat/rsd: make tag_buf string larger
...
av_get_codec_tag_string() uses more that 1 char for unprintable characters.
10 years ago
Clément Bœsch
d60fb4f794
avformat/apngdec: make tag_buf string larger
...
av_get_codec_tag_string() uses more that 1 char for unprintable characters.
10 years ago
Clément Bœsch
83b0fe395b
avformat/wavdec: make start_code string larger
...
av_get_codec_tag_string() uses more that 1 char for unprintable characters.
10 years ago
Thomas Volkert
e8d57e4163
wavdec: avoid output of arbitrary chars
...
use av_get_codec_tag_string() in wav_read_header() for printing the
faulty start code from riff header
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Thomas Volkert
1a971d33eb
wavdec: refactor wav_read_header()
...
Make it more readable and display an error message in case an invalid
header is detected (the current version just returns
AVERROR_INVALIDDATA)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Martin Storsjö
e2ce163922
mpegts: Support running the write_trailer function without an AVIOContext
...
If opening and closing dynamic buffers as AVIOContext, we may
not have any AVIOContext available when wanting to close and
deallocate the muxer. Allow calling write_trailer despite this.
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Martin Storsjö
4895aa65c6
libavformat: Allow calling av_write_trailer with a NULL AVIOContext
...
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Michael Niedermayer
c3e6a55956
avcodec/vp3: Fix offset handling
...
Fixes use of uninitialized memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
2df5b506ca
avcodec/mpegvideo_enc: remove rtp_mode=0 for H261
...
Suggested-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
James Almer
a4d62f7775
x86/constants: fix alignment of pw_255
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
649c158e8c
Add FFMPEG_VERSION into the binary libs
...
This simplifies identifying from which revision a binary of a lib came from
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
869b56cae6
avformat/mpegenc: replace always enabled asserts by av_assert0()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
b44ae59b70
avfilter/vsrc_life: Use av_freep() avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
4d48ea3c4b
avfilter/vf_libopencv: use av_freep() avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Supraja Meedinti
4e1ecfe214
libavutil: Added cbc mode to cast128
...
Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Previous version reviewed-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Ronald S. Bultje
bdc1e3e3b2
vp9/x86: intra prediction sse2/32bit support.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Ronald S. Bultje
b6e1711223
vp9/x86: invert hu_ipred left array ordering.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
e67496fe9d
Merge commit 'cee4490b521fd0d02476d46aa2598af24fb8d686'
...
* commit 'cee4490b521fd0d02476d46aa2598af24fb8d686':
on2avc: check number of channels
See: 550f3e9df3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
c266d0e1bd
Merge commit 'd423dd72be451462c6fb1cbbe313bed0194001ab'
...
* commit 'd423dd72be451462c6fb1cbbe313bed0194001ab':
smc: fix the bounds check
Conflicts:
libavcodec/smc.c
See: c727401aa9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
8af8833591
Merge commit '0b39ac6f54505a538c21fe49a626de94c518c903'
...
* commit '0b39ac6f54505a538c21fe49a626de94c518c903':
gifdec: refactor interleave end handling
Conflicts:
libavcodec/gifdec.c
See: 8f1457864b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Carl Eugen Hoyos
96ff6d3805
lavf/rtp_h261: Replace restrict with av_restrict.
...
Fixes compilation on Windows.
10 years ago
Michael Niedermayer
6c7b153d97
Merge commit '17ba719d9ba30c970f65747f42d5fbb1e447ca28'
...
* commit '17ba719d9ba30c970f65747f42d5fbb1e447ca28':
mmvideo: check frame dimensions
See: 8b0e96e1f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
f346e37aa2
Merge commit '88626e5af8d006e67189bf10b96b982502a7e8ad'
...
* commit '88626e5af8d006e67189bf10b96b982502a7e8ad':
jvdec: check frame dimensions
See: 105654e376
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
6c68522a2a
Merge commit '809c3023b699c54c90511913d3b6140dd2436550'
...
* commit '809c3023b699c54c90511913d3b6140dd2436550':
mjpegdec: check for pixel format changes
Conflicts:
libavcodec/mjpegdec.c
See: 5c378d6a6d
See: a2f680c7bc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
24af050c2f
Merge commit '64f7575fbd64e5b65d5c644347408588c776f1fe'
...
* commit '64f7575fbd64e5b65d5c644347408588c776f1fe':
mov: avoid a memleak when multiple stss boxes are present
Conflicts:
libavformat/mov.c
See: 5ab882d728
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
cee4490b52
on2avc: check number of channels
...
Fixes invalid memory access.
CC: libav-stable@libav.org
Bug-ID: CVE-2014-8549
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
10 years ago
Michael Niedermayer
d423dd72be
smc: fix the bounds check
...
Fixes invalid writes when there are more blocks in a run than total
remaining blocks.
CC: libav-stable@libav.org
Bug-ID: CVE-2014-8548
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
10 years ago
Michael Niedermayer
0b39ac6f54
gifdec: refactor interleave end handling
...
Fixes invalid writes with very small image heights.
CC: libav-stable@libav.org
Bug-ID: CVE-2014-8547
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
10 years ago
Anton Khirnov
17ba719d9b
mmvideo: check frame dimensions
...
The frame size must be set by the caller and each dimension must be a
multiple of 2.
CC: libav-stable@libav.org
Bug-ID: CVE-2014-8543
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
10 years ago
Anton Khirnov
88626e5af8
jvdec: check frame dimensions
...
The frame size must be set by the caller and each dimension must be a
multiple of 8.
CC: libav-stable@libav.org
Bug-ID: CVE-2014-8542
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
10 years ago
Anton Khirnov
809c3023b6
mjpegdec: check for pixel format changes
...
Fixes possible invalid memory access.
Based on code by Michael Niedermayer <michaelni@gmx.at>
CC: libav-stable@libav.org
Bug-ID: CVE-2014-8541
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
10 years ago
Anton Khirnov
64f7575fbd
mov: avoid a memleak when multiple stss boxes are present
...
CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
10 years ago
Michael Niedermayer
c89751aa21
Merge commit '210461c0a83a5625560fa1d92229200dc7fb869b'
...
* commit '210461c0a83a5625560fa1d92229200dc7fb869b':
imgconvert: check memory allocations and propagate errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
8ccfafa7b4
Merge commit '596b5c488fa1d40f114a64d3b73e1863cab073fb'
...
* commit '596b5c488fa1d40f114a64d3b73e1863cab073fb':
wma: check memory allocations and propagate errors
Conflicts:
libavcodec/wma.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
8c9a23833d
Merge commit '63be97ec403023fb664798432acedaf6e6922527'
...
* commit '63be97ec403023fb664798432acedaf6e6922527':
lavfi: always check av_expr_parse_and_eval() return value
not merged, this is incorrect
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
c054cff87a
Merge commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788'
...
* commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788':
xcbgrab: Move NULL check before pointer dereference
Conflicts:
libavdevice/xcbgrab.c
See: e86df0206f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
d05b154b5b
Merge commit '5ac06633cb63fcc51f2471a3478b44d3f010b16b'
...
* commit '5ac06633cb63fcc51f2471a3478b44d3f010b16b':
takdec: check av_samples_get_buffer_size() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
69234e29ad
Merge commit '16c7a8a142277aa3c98b4802ee57daaebe6999e5'
...
* commit '16c7a8a142277aa3c98b4802ee57daaebe6999e5':
aacps: invert the order of parameters of ipdopd_reset()
See: 9f36ec6aa9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
bf6e332cb4
Merge commit '76ccf114a6c107218e2a1948afc1d0fb3ac7ba0b'
...
* commit '76ccf114a6c107218e2a1948afc1d0fb3ac7ba0b':
rtsp: check ffurl_get_file_handle() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
988d27b802
Merge commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e'
...
* commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e':
check memory errors from av_strdup()
Conflicts:
avprobe.c
libavformat/matroskaenc.c
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
76a8127a45
Merge commit '9745f19ffc9031ce480e43d7cf1053b58100d70f'
...
* commit '9745f19ffc9031ce480e43d7cf1053b58100d70f':
assdec: check the right variable
Conflicts:
libavcodec/assdec.c
See: cc7342f712
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
5387b0cbfb
Merge commit '971099ff5a85377579eb5b8d3620e283957f097e'
...
* commit '971099ff5a85377579eb5b8d3620e283957f097e':
aacenc: correctly check returned value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
445ec2dfcb
Merge commit 'ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d'
...
* commit 'ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d':
lcl: return an appropriate error code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
6781ec6714
Merge commit '8b263331c5ebbb10b6ea521e9fd56751ba94254b'
...
* commit '8b263331c5ebbb10b6ea521e9fd56751ba94254b':
mpegts: check get16() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
5a1cd796e2
Merge commit '430a8168594b3cb29f44141d4da88f2c642de06f'
...
* commit '430a8168594b3cb29f44141d4da88f2c642de06f':
oggdec: add support for VP8 demuxing
Conflicts:
Changelog
libavformat/oggparsevp8.c
libavformat/version.h
See: d890db5f53
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
934f2d2f5c
Merge commit '38129c26c51b933d7db423f904ba0cd6a88ca1ed'
...
* commit '38129c26c51b933d7db423f904ba0cd6a88ca1ed':
cmdutils: check file access functions return values
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
ff4f2036de
Merge commit 'c63dd3f0a48a9f6389d253597ab51caddc0118db'
...
* commit 'c63dd3f0a48a9f6389d253597ab51caddc0118db':
a64multi: check elbg return values
Conflicts:
libavcodec/a64multienc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
bb7ad47ddf
Merge commit '3beb9cbad35218ed1fb3473eeb3cfc97a931bff4'
...
* commit '3beb9cbad35218ed1fb3473eeb3cfc97a931bff4':
roqvideo: check memory allocations and propagate errors
Conflicts:
libavcodec/roqvideoenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago