ffmpeg/libavutil
Michael Niedermayer 51ac1ce966 libavutil/channel_layout: Check strtol*() for failure
Fixes assertion failure
Fixes: 4f5814bb15d2dda6fc18ef9791b13816/signal_sigabrt_7ffff6ae7cc9_65_7209d160d168b76f311be6cd64a548eb.wv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit c9bfd6a8c3)

Conflicts:

	libavutil/channel_layout.c
2015-12-06 12:40:49 +01:00
..
aarch64 Merge commit 'a238b83b13640e3192d7d4aaad2242f13a9a84a1' 2014-08-04 04:06:34 +02:00
arm arm: only enable setend on ARMv6 2015-08-20 14:29:12 +02:00
avr32
bfin Merge commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73' 2014-06-02 19:38:01 +02:00
mips
ppc avutil/ppc/float_dsp_altivec: ppc: Fix bug in ff_vector_fmul_add_altivec() affecting little endian environments on POWER8 2014-09-11 18:36:34 +02:00
sh4
tomi
x86 avutil/x86/cpu: fix cpuid sub-leaf selection 2014-10-04 23:52:28 +02:00
Makefile avcodec: export motion vectors in frame side data on demand 2014-08-18 14:13:57 +02:00
adler32.c adler32: Fix doxy group definition 2014-04-07 01:31:02 +02:00
adler32.h adler32: Fix doxy group definition 2014-04-07 01:31:02 +02:00
aes.c Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec' 2014-01-26 01:54:55 +01:00
aes.h
atomic.c Merge commit '874c751cc5b99cd68932e21c2c3a0d21134207e0' 2014-02-19 21:53:58 +01:00
atomic.h Merge remote-tracking branch 'qatar/master' 2013-12-20 13:16:56 +01:00
atomic_gcc.h
atomic_suncc.h
atomic_win32.h Merge commit '7c371754fbc0dcc23bd00278b147f8095ccc5625' 2014-08-15 12:38:36 +02:00
attributes.h Merge commit '5858a67f135a7395c548482c73cf3d39bcdd3022' 2013-11-03 12:38:13 +01:00
audio_fifo.c avutil/audio_fifo: Use av_mallocz_array() 2014-05-05 18:59:56 +02:00
audio_fifo.h Merge commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6' 2014-07-07 00:55:52 +02:00
audioconvert.h
avassert.h
avstring.c avutil/avstring: Use size_t in av_strlcatf() 2015-06-01 23:25:20 +02:00
avstring.h Merge commit '69e7336b8e16ee65226fc20381baf537f4b125e6' 2014-07-29 20:24:42 +02:00
avutil.h avutil: fix version macros doxygen module 2014-07-04 20:54:19 +02:00
avutilres.rc Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
base64.c Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec' 2014-01-26 01:54:55 +01:00
base64.h
blowfish.c
blowfish.h
bprint.c avutil & avdevice: remove av_bprint_fd_contents() 2014-07-15 21:49:56 +02:00
bprint.h avutil & avdevice: remove av_bprint_fd_contents() 2014-07-15 21:49:56 +02:00
bswap.h Fix compile error on bfin. 2014-08-05 01:54:47 +02:00
buffer.c avutil/buffer: use the old atomics based code for the release branch 2014-11-28 01:15:11 +01:00
buffer.h Revert "lavu/buffer: add release function" 2014-03-06 03:23:40 +01:00
buffer_internal.h avutil/buffer_internal: leave the buffer pool entries volatile 2014-11-28 01:17:56 +01:00
channel_layout.c libavutil/channel_layout: Check strtol*() for failure 2015-12-06 12:40:49 +01:00
channel_layout.h channel_layout: doxy: merge functions with macros 2014-07-04 22:06:49 +02:00
colorspace.h
common.h avutil/common: Add FFNABS() 2015-12-06 12:40:48 +01:00
cpu.c avutil/cpu: add missing check for mmxext to av_force_cpu_flags 2015-03-28 22:10:57 -03:00
cpu.h avutil: turn arm setend into a cpuflag 2014-08-13 14:50:15 +02:00
cpu_internal.h Merge commit 'b7b17ed66e199afc7246e642bf3b35c3f8eca217' 2014-01-15 14:42:49 +01:00
crc.c Merge commit '0983d48111f578e17e8c1967d25ce593fce62b63' 2014-04-17 22:38:51 +02:00
crc.h Merge commit '0983d48111f578e17e8c1967d25ce593fce62b63' 2014-04-17 22:38:51 +02:00
des.c
des.h
dict.c avutil/dict: Use size_t for appending strings 2015-06-01 23:25:20 +02:00
dict.h dict.c: Free non-strduped av_dict_set arguments on error. 2014-08-23 15:28:48 +02:00
display.c Merge commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4' 2014-07-09 23:57:20 +02:00
display.h Merge commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4' 2014-07-09 23:57:20 +02:00
downmix_info.c Merge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c' 2014-02-16 02:05:29 +01:00
downmix_info.h fix spelling errors 2014-07-12 22:33:27 +02:00
dynarray.h fix spelling errors 2014-07-12 22:33:27 +02:00
error.c libavutil/error: fix build with musl toolchain 2014-09-03 20:01:25 +02:00
error.h Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45' 2014-08-10 18:20:37 +02:00
eval.c Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39' 2014-08-15 21:00:50 +02:00
eval.h Do not leave positive values undefined when negative are defined as error 2013-10-19 16:42:57 +02:00
fifo.c avutil/fifo: Fix the case where func() returns less bytes than requested in av_fifo_generic_write() 2015-08-20 14:38:27 +02:00
fifo.h lavu/fifo: add av_fifo_alloc_array function 2014-05-20 00:00:44 +02:00
file.c Merge commit '0a024268261d05ccdcf7e03c85fb78d22037a464' 2014-08-26 21:45:39 +02:00
file.h
file_open.c avutil/file_open: avoid file handle inheritance on Windows 2015-12-06 12:40:49 +01:00
fixed_dsp.c avutil/fixed_dsp: remove redundant cast 2014-04-01 17:57:30 +02:00
fixed_dsp.h libavutil: Add fixed_dsp 2014-04-01 17:36:33 +02:00
float_dsp.c Merge remote-tracking branch 'qatar/master' 2014-03-22 18:52:21 +01:00
float_dsp.h Merge remote-tracking branch 'qatar/master' 2014-03-19 02:52:08 +01:00
frame.c lavu/frame: fix malloc error path in av_frame_copy_props() 2014-12-20 02:25:54 +01:00
frame.h Replace incorrect use of "multiply" with "multiple" 2014-08-27 16:00:17 -08:00
hash.c lavu/hash.c: Add missing "static const". 2014-08-31 10:33:02 +02:00
hash.h lavu/hash: add hash_final helpers. 2014-04-29 13:24:11 +02:00
hmac.c
hmac.h
imgutils.c avutil/imgutils: correctly check for negative SAR components 2015-03-29 03:34:22 +02:00
imgutils.h Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39' 2014-08-15 21:00:50 +02:00
integer.c
integer.h
internal.h Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39' 2014-08-15 21:00:50 +02:00
intfloat.h
intfloat_readwrite.c avutil: Remove deprecated intfloat_readwrite code 2013-12-16 17:51:00 +01:00
intfloat_readwrite.h avutil: Remove deprecated intfloat_readwrite code 2013-12-16 17:51:00 +01:00
intmath.c
intmath.h intmath.h: Remove duplicated ARM include. 2014-08-31 18:33:27 +02:00
intreadwrite.h libavutil: document side effects of macros 2014-07-19 14:55:46 +02:00
lfg.c
lfg.h
libavutil.v lavu: stop exporting internal functions 2014-08-12 04:35:52 +02:00
libm.h Remove fminf() emulation. 2014-11-08 12:47:18 +01:00
lls.c drop LLS1, rename LLS2 to LLS 2014-08-09 23:20:31 +02:00
lls.h drop LLS1, rename LLS2 to LLS 2014-08-09 23:20:31 +02:00
log.c log: Unbreak no-tty support on 256color terminals 2015-01-18 09:47:32 -07:00
log.h lavu/log: add device category macros 2014-08-18 22:37:03 +02:00
log2_tab.c
lzo.c avutil/lzo: allow selecting the compression function in the test code 2014-06-24 00:32:34 +02:00
lzo.h
macros.h Merge remote-tracking branch 'qatar/master' 2013-12-30 11:23:32 +01:00
mathematics.c avutil/mathematics/av_add_stable: Avoid av_cmp_q() call 2014-06-02 19:06:39 +02:00
mathematics.h fix various typos 2014-06-03 10:58:19 -08:00
md5.c avutil/md5: workaround clang 3.5 #20849 2014-09-05 00:43:48 +02:00
md5.h
mem.c libavutil/mem: use size_t for the length in av_strdup() 2015-06-01 23:25:20 +02:00
mem.h Merge commit '8ddc32629a6d6be77256694c9e322dde134609f3' 2014-08-14 00:29:06 +02:00
motion_vector.h avutil/motion_vector.h: fix coordinate types 2014-08-21 12:27:34 +02:00
murmur3.c
murmur3.h
old_pix_fmts.h Merge remote-tracking branch 'qatar/master' 2013-11-14 03:26:35 +01:00
opencl.c Revert "avutil/opencl: is_compiled flag not being cleared in av_opencl_uninit" 2015-03-09 14:32:51 -03:00
opencl.h avutil/opencl: don't include config.h 2015-02-14 02:21:19 -03:00
opencl_internal.c lavu: rename ff_opencl_set_parameter() to avpriv_opencl_set_parameter() 2014-08-12 03:49:45 +02:00
opencl_internal.h lavu: rename ff_opencl_set_parameter() to avpriv_opencl_set_parameter() 2014-08-12 03:49:45 +02:00
opt.c avutil/opt: Fix type used to access AV_OPT_TYPE_SAMPLE_FMT 2015-02-13 20:48:08 +01:00
opt.h Merge commit 'a8c104a511f97e4ea617df73b31737e28a8a5126' 2014-08-13 22:39:54 +02:00
parseutils.c Merge commit '6b45f05ef5b241fd1513702119af9c30056a0ac5' 2013-12-12 19:12:33 +01:00
parseutils.h lavu/parseutils: add av_get_known_color_name() 2013-10-27 09:16:05 +01:00
pca.c avutil/pca: Check for av_malloc* failures 2015-04-25 15:06:54 +02:00
pca.h
pixdesc.c Merge commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6' 2014-08-04 22:12:24 +02:00
pixdesc.h Merge commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26' 2014-08-04 21:32:03 +02:00
pixelutils.c avutil/pixelutils: add small buffers tests 2014-09-02 07:29:41 +02:00
pixelutils.h avutil: add pixelutils API 2014-08-05 21:05:52 +02:00
pixfmt.h Merge commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6' 2014-08-04 22:12:24 +02:00
qsort.h
random_seed.c msvc: fix implicitly declared read/close. 2014-08-02 14:52:17 +02:00
random_seed.h
rational.c avutil/rational: av_add_stable() test code 2014-01-04 15:10:14 +01:00
rational.h lavu/rational: add syntactic sugar. 2014-01-19 17:12:22 +01:00
rc4.c
rc4.h
replaygain.h Merge commit '8542f9c4f17125d483c40c0c5723842f1c982f81' 2014-04-04 22:52:12 +02:00
ripemd.c
ripemd.h
samplefmt.c Merge commit '0e830094ad0dc251613a0aa3234d9c5c397e02e6' 2014-02-05 01:30:24 +01:00
samplefmt.h samplefmt: Add doxygen categories 2014-07-06 11:44:01 -07:00
sha.c
sha.h
sha512.c
sha512.h
softfloat.c
softfloat.h
stereo3d.c Merge commit '159a06dfc83d189f753c4583583ddfb571552ff5' 2014-08-14 00:17:47 +02:00
stereo3d.h Merge commit '440842c4eb1d7709654ec97cd687663d11ef499c' 2014-06-19 23:47:10 +02:00
thread.h libavutil/threads.h: correct an include to be local 2014-11-29 12:07:17 +01:00
threadmessage.c lavu: add thread message API. 2014-05-26 11:40:15 +02:00
threadmessage.h lavu: add thread message API. 2014-05-26 11:40:15 +02:00
time.c lavu: add av_gettime_relative() 2014-05-17 15:28:03 +02:00
time.h lavu: add av_gettime_relative() 2014-05-17 15:28:03 +02:00
timecode.c Timecode: Support 48fps 2014-05-28 03:25:41 +02:00
timecode.h
timer.h Fix compile error on bfin. 2014-08-05 01:54:47 +02:00
timestamp.h avutil/timestamp: Warn about missing __STDC_FORMAT_MACROS for C++ use 2014-03-13 17:32:15 +01:00
tree.c tree-test: Don't return restricted exit codes 2013-10-24 10:59:26 +01:00
tree.h
utf8.c avutil/utf8: put under #ifdef TEST 2013-11-22 17:16:11 +01:00
utils.c Add FFMPEG_VERSION into the binary libs 2014-12-20 02:26:27 +01:00
version.h dict.c: Free non-strduped av_dict_set arguments on error. 2014-08-23 15:28:48 +02:00
x86_cpu.h
xga_font_data.c
xga_font_data.h
xtea.c xtea: Add Doxy @file and group 2014-04-07 01:31:36 +02:00
xtea.h xtea: Add Doxy @file and group 2014-04-07 01:31:36 +02:00