ffmpeg.git
6 years agoMerge commit 'f412b2c9f3a7add0ab8021262ec4bad249347e30'
Michael Niedermayer [Fri, 20 Dec 2013 23:11:59 +0000 (00:11 +0100)]
Merge commit 'f412b2c9f3a7add0ab8021262ec4bad249347e30'

* commit 'f412b2c9f3a7add0ab8021262ec4bad249347e30':
  flv: Use the correct type to hold the file offset

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '15739a9bd19a7d47ad8afb25348c684a3bdd6ef2'
Michael Niedermayer [Fri, 20 Dec 2013 23:04:19 +0000 (00:04 +0100)]
Merge commit '15739a9bd19a7d47ad8afb25348c684a3bdd6ef2'

* commit '15739a9bd19a7d47ad8afb25348c684a3bdd6ef2':
  jvdec: Do not feed the decoder with known wrong data

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e518cb863edc931888ccca6cad86f73ca7430cef'
Michael Niedermayer [Fri, 20 Dec 2013 22:56:43 +0000 (23:56 +0100)]
Merge commit 'e518cb863edc931888ccca6cad86f73ca7430cef'

* commit 'e518cb863edc931888ccca6cad86f73ca7430cef':
  jvdec: Fix memory leak of jv->frames

See: 596814f9781772050c65bdd8add27445bc8374a4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '027712e851da4d124a842c9e2802f95d50582553'
Michael Niedermayer [Fri, 20 Dec 2013 22:49:56 +0000 (23:49 +0100)]
Merge commit '027712e851da4d124a842c9e2802f95d50582553'

* commit '027712e851da4d124a842c9e2802f95d50582553':
  jvdec: Return EOF on end of file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'dfc50ac85e9d68a771b556297b7c411650206f3b'
Michael Niedermayer [Fri, 20 Dec 2013 22:44:31 +0000 (23:44 +0100)]
Merge commit 'dfc50ac85e9d68a771b556297b7c411650206f3b'

* commit 'dfc50ac85e9d68a771b556297b7c411650206f3b':
  x86: mpegvideo: move denoise_dct asm to mpegvideoenc

Conflicts:
libavcodec/x86/mpegvideo.c
libavcodec/x86/mpegvideoenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b254490bdabb21bd517c05b1a68717f9952ac8c4'
Michael Niedermayer [Fri, 20 Dec 2013 22:33:10 +0000 (23:33 +0100)]
Merge commit 'b254490bdabb21bd517c05b1a68717f9952ac8c4'

* commit 'b254490bdabb21bd517c05b1a68717f9952ac8c4':
  vc1: arm: Add NEON no_rnd chroma MC

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '832e19063209a5f355af733d1a45f5051f49ce33'
Michael Niedermayer [Fri, 20 Dec 2013 22:11:29 +0000 (23:11 +0100)]
Merge commit '832e19063209a5f355af733d1a45f5051f49ce33'

* commit '832e19063209a5f355af733d1a45f5051f49ce33':
  vc1: arm: Add NEON assembly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/pva: Make sure the header is large enough before reading the timestamp from it
Michael Niedermayer [Fri, 20 Dec 2013 17:07:30 +0000 (18:07 +0100)]
avformat/pva: Make sure the header is large enough before reading the timestamp from it

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f34b5dc6d58_2674_PVA_test-partial.pva
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/pva: Make sure the first byte of pes_header_data has been initialized
Michael Niedermayer [Fri, 20 Dec 2013 17:07:30 +0000 (18:07 +0100)]
avformat/pva: Make sure the first byte of pes_header_data has been initialized

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f53c1d0e95c_2674_PVA_test-partial.pva
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/hue: show first decimal value of saturation
Stefano Sabatini [Fri, 20 Dec 2013 18:25:42 +0000 (19:25 +0100)]
lavfi/hue: show first decimal value of saturation

6 years agolavfi/hue: use av_clip_uint8() instead of av_clip_uint8_c()
Stefano Sabatini [Fri, 20 Dec 2013 18:11:35 +0000 (19:11 +0100)]
lavfi/hue: use av_clip_uint8() instead of av_clip_uint8_c()

The generic version should be faster if optimized.

6 years agolavfi/hue: force table initialization for the first frame
Stefano Sabatini [Fri, 20 Dec 2013 18:10:46 +0000 (19:10 +0100)]
lavfi/hue: force table initialization for the first frame

6 years agoavformat/smacker: check for format mismatch more completely
Michael Niedermayer [Fri, 20 Dec 2013 17:07:30 +0000 (18:07 +0100)]
avformat/smacker: check for format mismatch more completely

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f6e83322950_9769_wetlogo.smk
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/nistspheredec: initialize header_size to -1
Michael Niedermayer [Fri, 20 Dec 2013 17:07:30 +0000 (18:07 +0100)]
avformat/nistspheredec: initialize header_size to -1

Fixes use of uninitialized memory
This also avoids the need to check the scanf() return as the subsequent check catches it
Fixes: msan_uninit-mem_7f712e4dc173_7414_nist_ulaw.nist
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflv: Use the correct type to hold the file offset
Luca Barbato [Thu, 19 Dec 2013 06:38:15 +0000 (07:38 +0100)]
flv: Use the correct type to hold the file offset

6 years agojvdec: Do not feed the decoder with known wrong data
Luca Barbato [Fri, 13 Dec 2013 02:07:57 +0000 (03:07 +0100)]
jvdec: Do not feed the decoder with known wrong data

Still assume the size value is right in non-explode mode.

6 years agojvdec: Fix memory leak of jv->frames
Paul B Mahol [Tue, 3 Jul 2012 09:51:44 +0000 (09:51 +0000)]
jvdec: Fix memory leak of jv->frames

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojvdec: Return EOF on end of file
Luca Barbato [Fri, 13 Dec 2013 02:10:16 +0000 (03:10 +0100)]
jvdec: Return EOF on end of file

6 years agox86: mpegvideo: move denoise_dct asm to mpegvideoenc
Anton Khirnov [Fri, 20 Dec 2013 12:00:22 +0000 (13:00 +0100)]
x86: mpegvideo: move denoise_dct asm to mpegvideoenc

This function is encoding-only.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoavcodec/mpegvideo_enc: fix frame skipping with intra only codecs
Michael Niedermayer [Fri, 20 Dec 2013 12:50:46 +0000 (13:50 +0100)]
avcodec/mpegvideo_enc: fix frame skipping with intra only codecs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpegvideo_enc: fix integer overflow with -skip_exp >= 2
Michael Niedermayer [Fri, 20 Dec 2013 12:35:39 +0000 (13:35 +0100)]
avcodec/mpegvideo_enc: fix integer overflow with -skip_exp >= 2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1: arm: Add NEON no_rnd chroma MC
Mason Carter [Sun, 15 Dec 2013 01:32:57 +0000 (17:32 -0800)]
vc1: arm: Add NEON no_rnd chroma MC

Apply David Conrad's old patch to the modern codebase.

http://ffmpeg.org/pipermail/ffmpeg-devel/2009-April/059877.html

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovc1: arm: Add NEON assembly
Mason Carter [Sun, 15 Dec 2013 01:32:56 +0000 (17:32 -0800)]
vc1: arm: Add NEON assembly

For:

ff_vc1_inv_trans_{8,4}x{8,4}_{dc_,}neon
ff_put_pixels8x8_neon
ff_put_vc1_mspel_mc{0,1,2,3}{0,1,2,3}_neon (except for 00)

Based on ARM assembly code in libavcodec/arm by Rob Clark and Mans
Rullgard.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 20 Dec 2013 12:09:39 +0000 (13:09 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  atomics: cosmetics: Restructure ifdefs for greater clarity

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8558595a59913a4667f57d5a4658b1340f1a4354'
Michael Niedermayer [Fri, 20 Dec 2013 11:48:16 +0000 (12:48 +0100)]
Merge commit '8558595a59913a4667f57d5a4658b1340f1a4354'

* commit '8558595a59913a4667f57d5a4658b1340f1a4354':
  configure: Express atomics/thread deps through the dependency system

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoatomics: cosmetics: Restructure ifdefs for greater clarity
Diego Biurrun [Wed, 18 Dec 2013 21:28:11 +0000 (22:28 +0100)]
atomics: cosmetics: Restructure ifdefs for greater clarity

Also fix the #endif comment in a few places and #include config.h to
avoid assuming it is #included implicitly.

6 years agoavformat/sierravmd: Check avio_read return value
Michael Niedermayer [Thu, 19 Dec 2013 19:48:51 +0000 (20:48 +0100)]
avformat/sierravmd: Check avio_read return value

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f82af392dae_1848_HR060606.VMD
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoremuxing .opus files to .webm codec->delay must be copied too
Jan Gerber [Thu, 19 Dec 2013 14:56:49 +0000 (20:26 +0530)]
remuxing .opus files to .webm codec->delay must be copied too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/nistspheredec: check sscanf() success before using the result
Michael Niedermayer [Thu, 19 Dec 2013 19:48:51 +0000 (20:48 +0100)]
avformat/nistspheredec: check sscanf() success before using the result

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f935c3c6c1a_7413_nist_pcms8.nist
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/iff: warn about truncated input to decode_byterun() and clear remaining output
Michael Niedermayer [Thu, 19 Dec 2013 19:48:51 +0000 (20:48 +0100)]
avcodec/iff: warn about truncated input to decode_byterun() and clear remaining output

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fe205e395ed_8988_test.iff
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Express atomics/thread deps through the dependency system
Diego Biurrun [Wed, 18 Dec 2013 20:52:28 +0000 (21:52 +0100)]
configure: Express atomics/thread deps through the dependency system

6 years agorpl: Dont fill the index with entries that failed to be parsed
Michael Niedermayer [Thu, 19 Dec 2013 18:22:38 +0000 (19:22 +0100)]
rpl: Dont fill the index with entries that failed to be parsed

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fd10a199a3c_6204_landing.rpl
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavformat/mpegts: expose raw packet size
Leandro Dorileo [Thu, 19 Dec 2013 16:39:51 +0000 (14:39 -0200)]
libavformat/mpegts: expose raw packet size

We cannot easily determine if an mpeg TS's packet size is DVHS, FEC
or so on, for that we need to expose the internal raw_packet_size
field.

Signed-off-by: Leandro Dorileo <leandro.maciel.dorileo@intel.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/dxa: check avio_read() return
Michael Niedermayer [Thu, 19 Dec 2013 16:14:59 +0000 (17:14 +0100)]
avformat/dxa: check avio_read() return

Fixes use of uninitialized memory
Fixes msan_uninit-mem_7fd4d4323ddd_2453_MUSOSP1.dxa
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/dxa: check for overread in decode_13()
Michael Niedermayer [Thu, 19 Dec 2013 16:14:59 +0000 (17:14 +0100)]
avcodec/dxa: check for overread in decode_13()

Fixes use of uninitialized memory
Fixes part of msan_uninit-mem_7f5ea8284fb7_8317_scummvm.dxa
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/dxa: add padding to decomp_buf
Michael Niedermayer [Thu, 19 Dec 2013 16:14:59 +0000 (17:14 +0100)]
avcodec/dxa: add padding to decomp_buf

Fixes use of uninitialized memory
Fixes part of msan_uninit-mem_7f5ea8284fb7_8317_scummvm.dxa
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/flashsv: check decode_hybrid() for overread
Michael Niedermayer [Thu, 19 Dec 2013 15:17:21 +0000 (16:17 +0100)]
avcodec/flashsv: check decode_hybrid() for overread

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f906558274e_268_14_244486_2009_04_28.flv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/deshake_opencl: optimze transform filter
Lenny Wang [Sat, 14 Dec 2013 11:11:00 +0000 (05:11 -0600)]
lavfi/deshake_opencl: optimze transform filter

Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/swfdec: clear 4 bytes at the end of a packet if they are not initialized
Michael Niedermayer [Thu, 19 Dec 2013 03:38:16 +0000 (04:38 +0100)]
avformat/swfdec: clear 4 bytes at the end of a packet if they are not initialized

Fixes use of uninitialized memory
Fixes part of msan_uninit-mem_7f055dd0ab1b_9558_videopop_guitar_300k.swf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/swfdec: check avio_read() return code
Michael Niedermayer [Thu, 19 Dec 2013 02:50:05 +0000 (03:50 +0100)]
avformat/swfdec: check avio_read() return code

Fixes use of uninitialized memory
Fixes part of msan_uninit-mem_7f055dd0ab1b_9558_videopop_guitar_300k.swf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 19 Dec 2013 02:18:07 +0000 (03:18 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: Explicitly specify the pixel format for the pngparser test

Conflicts:
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/swfdec: check avio_read() return code
Michael Niedermayer [Thu, 19 Dec 2013 00:48:15 +0000 (01:48 +0100)]
avformat/swfdec: check avio_read() return code

Fixes use of uninitialized memory
Fixes msan_uninit-mem_7f90d9cce964_9558_videopop_guitar_300k.swf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/interplayvideo: Check that enough data is available for opcode_0x7/8/D
Michael Niedermayer [Wed, 18 Dec 2013 23:17:12 +0000 (00:17 +0100)]
avcodec/interplayvideo: Check that enough data is available for opcode_0x7/8/D

Fixes hypothetical use of uninitialized memory, no sample available

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/interplayvideo: Check that enough data is available for opcode_0x9
Michael Niedermayer [Wed, 18 Dec 2013 23:17:12 +0000 (00:17 +0100)]
avcodec/interplayvideo: Check that enough data is available for opcode_0x9

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fd5185b45df_5895_interplay-logo-2MB.mve
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/interplayvideo: Check that enough data is available for opcode_0xA
Michael Niedermayer [Wed, 18 Dec 2013 23:17:12 +0000 (00:17 +0100)]
avcodec/interplayvideo: Check that enough data is available for opcode_0xA

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f90e5be6b30_3965_baldursgate_camp.mve
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/ipmovie: Check palette size in OPCODE_SET_PALETTE
Michael Niedermayer [Wed, 18 Dec 2013 22:46:37 +0000 (23:46 +0100)]
avformat/ipmovie: Check palette size in OPCODE_SET_PALETTE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/ipmovie: Check that OPCODE_SET_PALETTE size is large enough
Michael Niedermayer [Wed, 18 Dec 2013 22:43:20 +0000 (23:43 +0100)]
avformat/ipmovie: Check that OPCODE_SET_PALETTE size is large enough

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fec1f40656c_4819_descent3_level5_16bit_partial.mve
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/ipmovie: remove superflous ()
Michael Niedermayer [Wed, 18 Dec 2013 22:15:52 +0000 (23:15 +0100)]
avformat/ipmovie: remove superflous ()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/ipmovie: Check that the OPCODE_INIT_AUDIO_BUFFERS size is large enough
Michael Niedermayer [Wed, 18 Dec 2013 22:13:15 +0000 (23:13 +0100)]
avformat/ipmovie: Check that the OPCODE_INIT_AUDIO_BUFFERS size is large enough

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f75b03c1f19_4820_descent3_level5_16bit_partial.mve
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/pngdec: fix signed overflow
Michael Niedermayer [Wed, 18 Dec 2013 21:15:32 +0000 (22:15 +0100)]
avcodec/pngdec: fix signed overflow

fixes fate ftrapv failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: Explicitly specify the pixel format for the pngparser test
Martin Storsjö [Wed, 18 Dec 2013 16:27:07 +0000 (18:27 +0200)]
fate: Explicitly specify the pixel format for the pngparser test

The RGB32 pixel format is RGBA/BGRA depending on target
endianness - make sure to convert it to one specific format for
the framecrc tests.

This fixes the pngparser fate test on big endian.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 18 Dec 2013 18:54:04 +0000 (19:54 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Prepare release notes for Libav 10 "Eks"

Conflicts:
doc/RELEASE_NOTES

Not merged because all that stuff has been in past releases

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/isom: zero MPEG4AudioConfig to avoid leaving fields uninitialized
Michael Niedermayer [Wed, 18 Dec 2013 18:39:05 +0000 (19:39 +0100)]
avformat/isom: zero MPEG4AudioConfig to avoid leaving fields uninitialized

Fixes: use of uninitialized memory
Fixes: msan_uninit-mem_7f392c443e0d_1433_Crowd_Applause_01.caf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/nuv: zero buffer padding
Michael Niedermayer [Wed, 18 Dec 2013 17:14:24 +0000 (18:14 +0100)]
avcodec/nuv: zero buffer padding

Fixes use of uninitialized memory
Fixes msan_uninit-mem_7f4a141261de_7405_nirvana.nuv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/dirac_dwt: initialize support value for fidelity wavelet
Michael Niedermayer [Wed, 18 Dec 2013 14:49:20 +0000 (15:49 +0100)]
avcodec/dirac_dwt: initialize support value for fidelity wavelet

Avoids use of uninitialized memory
Fixes: msan_uninit-mem_7f15e1988a6e_2748_RL_420p_ffdirac.drc
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoPrepare release notes for Libav 10 "Eks"
Anton Khirnov [Wed, 18 Dec 2013 02:52:13 +0000 (21:52 -0500)]
Prepare release notes for Libav 10 "Eks"

Additional editing by Diego Biurrun

6 years agolavf/concatdec: fix crash in case a file in script cannot be opened
Stefano Sabatini [Wed, 18 Dec 2013 13:56:36 +0000 (14:56 +0100)]
lavf/concatdec: fix crash in case a file in script cannot be opened

6 years agolavf/segment: increase logging level for message with segment start information
Stefano Sabatini [Tue, 17 Dec 2013 09:43:32 +0000 (10:43 +0100)]
lavf/segment: increase logging level for message with segment start information

Help debugging.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 18 Dec 2013 11:37:42 +0000 (12:37 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  png_parser: Fix parsing on big endian

See: 3d42addf336739a69aee47891413a46e4f64995b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd8fd183683b7495566b7e510a6536ae2efe8dfed'
Michael Niedermayer [Wed, 18 Dec 2013 11:23:41 +0000 (12:23 +0100)]
Merge commit 'd8fd183683b7495566b7e510a6536ae2efe8dfed'

* commit 'd8fd183683b7495566b7e510a6536ae2efe8dfed':
  vc1: Fix mb_height for field pictures

See: 017e234c204f8ffb5f85a073231247881be1ac6f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopng_parser: Fix parsing on big endian
Martin Storsjö [Wed, 18 Dec 2013 08:39:47 +0000 (10:39 +0200)]
png_parser: Fix parsing on big endian

Since pc.state is populated by shifting in from the end of the
32 bit word, the content within pc.state is already in native endian
and should not be read with the AV_R{L,B} functions.

This was already done correctly for state64 above.

This fixes the fate-corepng test on big endian.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavcodec/aacdec: default to non-wide 7.1 in non-strict mode
Anssi Hannula [Tue, 17 Dec 2013 21:04:31 +0000 (23:04 +0200)]
avcodec/aacdec: default to non-wide 7.1 in non-strict mode

AAC specification has 7.1(wide) as a default layout for 8-channel
streams (channel config 7). However, at least Nero AAC encoder encodes
non-wide 7.1 streams using the default channel config 7, mapping the
side channels of the original audio stream to the second
AAC_CHANNEL_FRONT pair in the AAC stream. Similarly, e.g. FAAD decodes
the second AAC_CHANNEL_FRONT pair as side channels, therefore decoding
the incorrect streams as if they were correct (and as the encoder
intended).

FFmpeg currently decodes such files by-the-spec, i.e. after decoding the
original front pair will be in AV_CH_FRONT_x_OF_CENTER and the original
side pair will be in AV_CH_FRONT_x.

As actual intended 7.1(wide) streams are very rare while misencoded 7.1
files actually exist in the wild, default to assuming a 7.1 layout was
intended unless in strict mode.

Fixes playback of e.g. 8_Channel_ID.m4a in samples.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRevert "Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'" (Bump libavutil...
Michael Niedermayer [Mon, 16 Dec 2013 22:24:52 +0000 (23:24 +0100)]
Revert "Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'" (Bump libavutil major version to account for the LLS API/ABI changes.)

This reverts commit 792845e436ddc5f3ce11ba02535a3372919061f2, reversing
changes made to 1d6666a6b828cca6c6b355a9b62f25607b1ced08.

Bumping libavutil requires all libraries that use libavutil to have their
major version bumped (yes breakage has been confirmed this is not a hypotheses)

One case of breakage is due to new types being added to AVOptions and
applications that linked to old libavutil and libswresample
then trying to use old libavutil (its soname changed so the old isnt updated)
and new swresample (its soame didnt change so it is updated)
the new swresample contains AVOption types that the old libavutil doesnt
know of thus the application attempting to access these avoptions
fails

AVOptions are used by all libs so the issue can potentially happen with
any other lib, libswresample was just the first that showed the problem
ive not checked if the other libs are affected currently by the same issue
or not

Also in addition to AVOptions, AVFrames are also defined in
libavutil, bumping it without all libs that use AVFrames could lead to
serious inconsistencies when 2 libs/app end up using 2 different libavutils

The alternative of bumping all is still possible after this revert, if it
turns out to be the preferred solution

6 years agoavcodec/vc1dec: use av_mallocz for luma_mv
Michael Niedermayer [Tue, 17 Dec 2013 20:53:07 +0000 (21:53 +0100)]
avcodec/vc1dec: use av_mallocz for luma_mv

This ensures that no mvs are uninitialized at the time of loop filtering
Fixes: msan_uninit-mem_7f0b6dfe293c_2786_SA20021.vc1
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1: Fix mb_height for field pictures
Michael Niedermayer [Sat, 14 Dec 2013 13:52:31 +0000 (14:52 +0100)]
vc1: Fix mb_height for field pictures

Tables are always allocated now with sufficient space for either progressive
or interlaced content. The alternative would be to detect a change
and reallocate.

This fixes decoding of a sample.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 17 Dec 2013 18:37:33 +0000 (19:37 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  apidoc: fix warning from stereo3d.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3d9fc21e593aa89b5877bd739268499b079052f2'
Michael Niedermayer [Tue, 17 Dec 2013 18:30:57 +0000 (19:30 +0100)]
Merge commit '3d9fc21e593aa89b5877bd739268499b079052f2'

* commit '3d9fc21e593aa89b5877bd739268499b079052f2':
  h264: Refactor decode_frame_packing_arrangement

Conflicts:
libavcodec/h264_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3a149e23d37f06d49ab0bb013a3b9cb0224bba5c'
Michael Niedermayer [Tue, 17 Dec 2013 18:04:32 +0000 (19:04 +0100)]
Merge commit '3a149e23d37f06d49ab0bb013a3b9cb0224bba5c'

* commit '3a149e23d37f06d49ab0bb013a3b9cb0224bba5c':
  hevc: Refactor decode_nal_sei_frame_packing_arrangement

Conflicts:
libavcodec/hevc_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'cfb4ee30977732674d30c20e93a761c33c743972'
Michael Niedermayer [Tue, 17 Dec 2013 17:16:26 +0000 (18:16 +0100)]
Merge commit 'cfb4ee30977732674d30c20e93a761c33c743972'

* commit 'cfb4ee30977732674d30c20e93a761c33c743972':
  fate: add a pngparser test

Conflicts:
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'eddff165b4cdc1f064245a4bad6f4265581c12b1'
Michael Niedermayer [Tue, 17 Dec 2013 17:08:37 +0000 (18:08 +0100)]
Merge commit 'eddff165b4cdc1f064245a4bad6f4265581c12b1'

* commit 'eddff165b4cdc1f064245a4bad6f4265581c12b1':
  fate: add utility function to test parser, demuxer, and decoder

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c'
Michael Niedermayer [Tue, 17 Dec 2013 16:58:06 +0000 (17:58 +0100)]
Merge commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c'

* commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c':
  png: add a standalone parser

Conflicts:
Changelog
libavcodec/png_parser.c
libavcodec/version.h

See: 2ee6dca3b8f40132be5c8b77e3700a9e3f26c382
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/utils: drop 2 dependancies on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/utils: drop 2 dependancies on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/libvorbisenc: drop dependancy on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/libvorbisenc: drop dependancy on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffprobe: drop dependancy on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
ffprobe: drop dependancy on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/flashsv2enc: drop dependancy on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/flashsv2enc: drop dependancy on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/j2kenc: drop dependancy on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/j2kenc: drop dependancy on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/libopenjpegenc: drop dependancy on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/libopenjpegenc: drop dependancy on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mjpegenc: drop dependancy on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/mjpegenc: drop dependancy on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/msvideo1enc: drop dependancy on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/msvideo1enc: drop dependancy on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/diracdec: avoid depending on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 14:30:20 +0000 (15:30 +0100)]
avcodec/diracdec: avoid depending on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/svq3: set last/next frames to defaults before use
Michael Niedermayer [Tue, 17 Dec 2013 13:54:29 +0000 (14:54 +0100)]
avcodec/svq3: set last/next frames to defaults before use

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/utils: implement avcodec_alloc_frame() through av_alloc_frame()
Michael Niedermayer [Tue, 17 Dec 2013 13:03:38 +0000 (14:03 +0100)]
avcodec/utils: implement avcodec_alloc_frame() through av_alloc_frame()

This ensures that theres just one AVFrame allocation function and libs dont
produce multiple AVFrame variants after a minor lib update

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: use av_frame_unref() to set frame defaults
Michael Niedermayer [Tue, 17 Dec 2013 13:02:29 +0000 (14:02 +0100)]
avcodec: use av_frame_unref() to set frame defaults

This ensures that the code isnt duplicated and cant become out of sync

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoapidoc: fix warning from stereo3d.h
Vittorio Giovara [Mon, 16 Dec 2013 13:40:06 +0000 (14:40 +0100)]
apidoc: fix warning from stereo3d.h

6 years agoh264: Refactor decode_frame_packing_arrangement
Vittorio Giovara [Fri, 13 Dec 2013 17:12:59 +0000 (18:12 +0100)]
h264: Refactor decode_frame_packing_arrangement

Directly set the fields when necessary.

6 years agohevc: Refactor decode_nal_sei_frame_packing_arrangement
Luca Barbato [Fri, 13 Dec 2013 15:39:45 +0000 (15:39 +0000)]
hevc: Refactor decode_nal_sei_frame_packing_arrangement

Directly set the fields when necessary.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agofate: add a pngparser test
Vittorio Giovara [Wed, 11 Dec 2013 09:40:13 +0000 (10:40 +0100)]
fate: add a pngparser test

6 years agofate: add utility function to test parser, demuxer, and decoder
Vittorio Giovara [Thu, 12 Dec 2013 15:08:31 +0000 (16:08 +0100)]
fate: add utility function to test parser, demuxer, and decoder

6 years agopng: add a standalone parser
Peter Holik [Thu, 12 Dec 2013 15:11:35 +0000 (16:11 +0100)]
png: add a standalone parser

Useful for reading png images from a pipe.

6 years agoavcodec/gifdec: check that the correct number of bytes was decoded
Michael Niedermayer [Tue, 17 Dec 2013 01:32:19 +0000 (02:32 +0100)]
avcodec/gifdec: check that the correct number of bytes was decoded

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f084c646637_9261_top_title_green_frog.gif
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoUDP: join multicast group on the interface specified with &localaddr=
Stoian Ivanov [Fri, 13 Dec 2013 10:49:34 +0000 (12:49 +0200)]
UDP: join multicast group on the interface specified with &localaddr=

When joining multicast groups, ffmpeg was using INADDR_ANY as interface address
which leads to enabling the multicast group on the interface with "default gateway".
Often multicast traffic is received over dedicated interface, which scenario ffmpeg was
unable to handle. With this patch, ffmpeg will enable multicast group to the interfaces
configured with address specified in &localaddr= parameter of udp:// URL. To avoid
loacal_addr resolve at udp_close(...) the UDPContext structure was extended with
struct sockaddr_storage local_addr_storage member, which is populated in udp_open(..)
and passed to udp_join_multicast_group()  and udp_leave_multicast_group().

Signed-off-by: Stoian Ivanov <s.ivanov@teracomm.bg>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/format: av_register_output_format() and av_register_intput_format() that...
Michael Niedermayer [Sun, 8 Dec 2013 01:29:28 +0000 (02:29 +0100)]
avformat/format: av_register_output_format() and av_register_intput_format() that work in O(1) time

Reviewed-by: Stefano Sabatini
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/utils: av_register_codec & hwaccel() that work in O(1) time
Michael Niedermayer [Sun, 8 Dec 2013 02:19:12 +0000 (03:19 +0100)]
avcodec/utils: av_register_codec & hwaccel() that work in O(1) time

Its possible to implement this with a few lines less code but it then
would flip the order of the list and require registration of external
codecs to be done first, also it could break user applications due to
this. Thus to maintain ABI this slighty more complex solution is
used.

Reviewed-by: Stefano Sabatini
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 16 Dec 2013 23:14:50 +0000 (00:14 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avutil: Remove deprecated intfloat_readwrite code

Conflicts:
libavutil/intfloat_readwrite.c
libavutil/intfloat_readwrite.h

The files are left in place as they are still used by some projects
mplayer is one.
Theres no hurry in removing the code, it can as well be removed once
no projects use it anymore

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '11bb5e10c36539bcc303ceaac6f88d9ecb66e07f'
Michael Niedermayer [Mon, 16 Dec 2013 22:57:23 +0000 (23:57 +0100)]
Merge commit '11bb5e10c36539bcc303ceaac6f88d9ecb66e07f'

* commit '11bb5e10c36539bcc303ceaac6f88d9ecb66e07f':
  build: Define __printf__ to __gnu_printf__ on MinGW*/gcc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d'
Michael Niedermayer [Mon, 16 Dec 2013 21:07:24 +0000 (22:07 +0100)]
Merge commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d'

* commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d':
  Bump major of libavfilter for reference counted buffer API changes.

Conflicts:
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'
Michael Niedermayer [Mon, 16 Dec 2013 20:36:14 +0000 (21:36 +0100)]
Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'

* commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c':
  Bump libavutil major version to account for the LLS API/ABI changes.

Conflicts:
libavutil/version.h

Bump done to stay compatible with libav, its not neccessary otherwise for ffmpeg
as we have the new ABI/API under LLS2 and the old (unused) under LLS

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffserver: extend report_config_error() facilities, and use it for warnings
Stefano Sabatini [Fri, 29 Nov 2013 07:54:50 +0000 (08:54 +0100)]
ffserver: extend report_config_error() facilities, and use it for warnings

6 years agoffserver: add stream Metadata option
Stefano Sabatini [Fri, 29 Nov 2013 07:41:24 +0000 (08:41 +0100)]
ffserver: add stream Metadata option

Also deprecate Author, Comment, Copyright, and Title options, and update
docs to use the new Metadata option.

6 years agoffserver: fix spacing typoin error message
Stefano Sabatini [Sun, 15 Dec 2013 22:12:30 +0000 (23:12 +0100)]
ffserver: fix spacing typoin error message