ffmpeg.git
7 years agolavf/mux: improve feedback in case of no streams in muxer
Stefano Sabatini [Sun, 15 Dec 2013 17:12:10 +0000 (18:12 +0100)]
lavf/mux: improve feedback in case of no streams in muxer

7 years agoavformat/oggparsetheora: zero extradata padding area
Michael Niedermayer [Sun, 15 Dec 2013 18:21:02 +0000 (19:21 +0100)]
avformat/oggparsetheora: zero extradata padding area

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f66fa0ac09d_9197_theora_a4_v6_k250_s0.ogg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/bink: use av_mallocz for data
Michael Niedermayer [Sun, 15 Dec 2013 15:52:37 +0000 (16:52 +0100)]
avcodec/bink: use av_mallocz for data

Fixes use of uninitialized memory
Fixes msan_uninit-mem_7fe8a5fd759d_2838_SPECTRE.BIK
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/id3v2: Check avio_read() return code in id3v2_parse()
Michael Niedermayer [Sun, 15 Dec 2013 14:42:53 +0000 (15:42 +0100)]
avformat/id3v2: Check avio_read() return code in id3v2_parse()

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f5a04a9b50d_7087_mp3__mp3__tooSmallFinal.mp3
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale/utils: check chroma width for fast bilinear scaler
Michael Niedermayer [Sun, 15 Dec 2013 13:13:55 +0000 (14:13 +0100)]
swscale/utils: check chroma width for fast bilinear scaler

Fixes artifacts where fast bilinear was used for downscaling chroma

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale/utils: remove useless ()
Michael Niedermayer [Sun, 15 Dec 2013 13:10:02 +0000 (14:10 +0100)]
swscale/utils: remove useless ()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale/utils: factor (d + 1 < 4) out
Michael Niedermayer [Sun, 15 Dec 2013 12:49:20 +0000 (13:49 +0100)]
swscale/utils: factor (d + 1 < 4) out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/msmpeg4dec: initialize dir_ptr in error cases
Michael Niedermayer [Sun, 15 Dec 2013 12:22:57 +0000 (13:22 +0100)]
avcodec/msmpeg4dec: initialize dir_ptr in error cases

Fixes use of uinitialized memory
Fixes: msan_uninit-mem_7f01b8799186_7278_msnaudio.asf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/msmpeg4dec: print error in case of invalid vlc in msmpeg4_decode_dc for versi...
Michael Niedermayer [Sun, 15 Dec 2013 12:22:03 +0000 (13:22 +0100)]
avcodec/msmpeg4dec: print error in case of invalid vlc in msmpeg4_decode_dc for version <=2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: update after 5f6c21117f23a3c825777cdb0565a21c5a468d35
Michael Niedermayer [Sun, 15 Dec 2013 11:21:49 +0000 (12:21 +0100)]
fate: update after 5f6c21117f23a3c825777cdb0565a21c5a468d35

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffprobe: show best_effort_timestamp in the frame section
wm4 [Thu, 28 Nov 2013 10:24:34 +0000 (11:24 +0100)]
ffprobe: show best_effort_timestamp in the frame section

This is useful for debugging.

Reference and ffprobe.xsd changes done and tested by Stefano Sabatini.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agoEnable parser in FLV demuxer for H264 codec
Alex Sukhanov [Thu, 12 Dec 2013 23:10:10 +0000 (15:10 -0800)]
Enable parser in FLV demuxer for H264 codec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/utils: treat flv like mov with timestamp discarding
Michael Niedermayer [Sun, 15 Dec 2013 03:17:05 +0000 (04:17 +0100)]
avformat/utils: treat flv like mov with timestamp discarding

This prevents a regression when using an avparser with flv h264

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sun, 15 Dec 2013 02:27:06 +0000 (03:27 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  libzvbi-teletextdec: set bitmap teletext canvas dimensions
  libzvbi-teletextdec: add chopped top row size to y offset
  libzvbi-teletextdec: use defined constants for bitmap char width and height
  libzvbi-teletextdec: cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/iff: fix memleak of packet
Michael Niedermayer [Sun, 15 Dec 2013 00:32:48 +0000 (01:32 +0100)]
avformat/iff: fix memleak of packet

Fixes: msan_uninit-mem_7f65b9788da6_388_24.iff
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/iff: shrink packets to the initialized data
Michael Niedermayer [Sun, 15 Dec 2013 00:32:48 +0000 (01:32 +0100)]
avformat/iff: shrink packets to the initialized data

Fixes use of uninitialized data
Fixes: msan_uninit-mem_7f65b9788da6_388_24.iff
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/svq3: cleanup context in case init fails
Michael Niedermayer [Sat, 14 Dec 2013 23:36:29 +0000 (00:36 +0100)]
avcodec/svq3: cleanup context in case init fails

Fixes memleaks

Fixes: msan_uninit-mem_7ff57193e77e_2715_RAW512K_Stream_004.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/mov: Check avio_read() return code in mov_read_extradata() and shrink the...
Michael Niedermayer [Sat, 14 Dec 2013 22:59:39 +0000 (23:59 +0100)]
avformat/mov: Check avio_read() return code in mov_read_extradata() and shrink the extradata if needed / return an error

Fixes use of uninitialized data
Fixes: msan_uninit-mem_7ff57193e77e_2715_RAW512K_Stream_004.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 14 Dec 2013 21:38:57 +0000 (22:38 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpdec_h264: Check the return value of functions doing allocations

See: c5f15f40b9b25f033fd9e8dd1e12763913098c11
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '6451c8853a07ff2e28bda950fb5e83fcf88c5cf4'
Michael Niedermayer [Sat, 14 Dec 2013 21:24:03 +0000 (22:24 +0100)]
Merge commit '6451c8853a07ff2e28bda950fb5e83fcf88c5cf4'

* commit '6451c8853a07ff2e28bda950fb5e83fcf88c5cf4':
  sdp: Check theora colorspace before producing the configuration string

See: db8a53d86a71c948bd41dd12d1ff1d3351ec2746
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '797f2a791397210ec1b591b326658805c5dbf104'
Michael Niedermayer [Sat, 14 Dec 2013 21:15:10 +0000 (22:15 +0100)]
Merge commit '797f2a791397210ec1b591b326658805c5dbf104'

* commit '797f2a791397210ec1b591b326658805c5dbf104':
  hdsenc: Check the init_file() return code
  hdsenc: Fix an off by one error in an array size check
  hdsenc: Avoid integer overflow

Conflicts:
libavformat/hdsenc.c

See: 572965c9a6b8173d918dea392aadfee1d44d7f47
See: 3dbf9afe857d480993786bea0ede9dd9526776d2
See: 6722e564a82bac471d92b02550b5017c09b539ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '5db4e88ecd32485341f6150c00f5ee5bfa74f62d'
Michael Niedermayer [Sat, 14 Dec 2013 21:07:26 +0000 (22:07 +0100)]
Merge commit '5db4e88ecd32485341f6150c00f5ee5bfa74f62d'

* commit '5db4e88ecd32485341f6150c00f5ee5bfa74f62d':
  configure: Detect Solaris libc in an OpenIndiana/illumos compatible way

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/ipmovie: Check OPCODE_CREATE_TIMER size
Michael Niedermayer [Sat, 14 Dec 2013 20:22:14 +0000 (21:22 +0100)]
avformat/ipmovie: Check OPCODE_CREATE_TIMER size

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f81e836ef8c_5930_ipmovie_interplayvideo_interplay_dpcm__bislogo.mve
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/bitstream_filters: remove mp3_header_decompress filter
Stefano Sabatini [Sat, 14 Dec 2013 20:47:51 +0000 (21:47 +0100)]
doc/bitstream_filters: remove mp3_header_decompress filter

It was removed in commit c6080d89009056530119ab794ad02e4d515c7754.

7 years agoChangelog: correct typo
Timothy Gu [Sat, 14 Dec 2013 20:39:47 +0000 (12:39 -0800)]
Changelog: correct typo

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
7 years agobuild fix: apetag.c depends on img2.c
Yu Xiaolei [Sat, 14 Dec 2013 07:47:39 +0000 (15:47 +0800)]
build fix: apetag.c depends on img2.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'rbultje/vp9-simd'
Michael Niedermayer [Sat, 14 Dec 2013 17:13:03 +0000 (18:13 +0100)]
Merge remote-tracking branch 'rbultje/vp9-simd'

* rbultje/vp9-simd:
  vp9/x86: idct_add_16x16_ssse3.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovp9/x86: idct_add_16x16_ssse3.
Ronald S. Bultje [Sat, 14 Dec 2013 13:09:18 +0000 (08:09 -0500)]
vp9/x86: idct_add_16x16_ssse3.

Currently only dc-only and full 16x16. Other subforms will follow in the
near future. Total decoding time of ped1080p.webm goes from 9.7 to 9.3
seconds. DC-only goes from 957 -> 131 cycles, and the full IDCT goes
from ~4050 to ~745 cycles.

7 years agoavcodec/vc1: fix DIFF2/NORM2 with width<=16
Michael Niedermayer [Sat, 14 Dec 2013 16:55:25 +0000 (17:55 +0100)]
avcodec/vc1: fix DIFF2/NORM2 with width<=16

Fixes read of uninitialized memory
Fixes msan_uninit-mem_7f785da000e8_585_480i30__codec_WVC1__mode_2__framerate_29.970__type_2__preproc_17.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/vc1dec: fix mby_start for interlaced content
Michael Niedermayer [Sat, 14 Dec 2013 16:11:21 +0000 (17:11 +0100)]
avcodec/vc1dec: fix mby_start for interlaced content

Fixes first frame of Ticket2531

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/vc1: fix mb_height for field pictures
Michael Niedermayer [Sat, 14 Dec 2013 13:52:31 +0000 (14:52 +0100)]
avcodec/vc1: fix mb_height for field pictures

Fixes ticket2531

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agortpdec_h264: Check the return value of functions doing allocations
Michael Niedermayer [Fri, 13 Dec 2013 00:27:26 +0000 (01:27 +0100)]
rtpdec_h264: Check the return value of functions doing allocations

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agosdp: Check theora colorspace before producing the configuration string
Martin Storsjö [Fri, 13 Dec 2013 22:27:26 +0000 (00:27 +0200)]
sdp: Check theora colorspace before producing the configuration string

This avoids a memory leak (or having to worry about freeing the
config string) if the colorspace isn't accepted.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agohdsenc: Check the init_file() return code
Michael Niedermayer [Thu, 12 Dec 2013 20:04:24 +0000 (21:04 +0100)]
hdsenc: Check the init_file() return code

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agohdsenc: Fix an off by one error in an array size check
Michael Niedermayer [Wed, 11 Dec 2013 19:17:23 +0000 (20:17 +0100)]
hdsenc: Fix an off by one error in an array size check

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agohdsenc: Avoid integer overflow
Michael Niedermayer [Wed, 11 Dec 2013 15:33:26 +0000 (16:33 +0100)]
hdsenc: Avoid integer overflow

Also remove a silly leftover pair of parentheses.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolibzvbi-teletextdec: set bitmap teletext canvas dimensions
Marton Balint [Sat, 7 Dec 2013 16:51:19 +0000 (17:51 +0100)]
libzvbi-teletextdec: set bitmap teletext canvas dimensions

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agolibzvbi-teletextdec: add chopped top row size to y offset
Marton Balint [Sat, 7 Dec 2013 16:18:27 +0000 (17:18 +0100)]
libzvbi-teletextdec: add chopped top row size to y offset

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agolibzvbi-teletextdec: use defined constants for bitmap char width and height
Marton Balint [Sat, 7 Dec 2013 16:14:15 +0000 (17:14 +0100)]
libzvbi-teletextdec: use defined constants for bitmap char width and height

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agolibzvbi-teletextdec: cosmetics
Marton Balint [Sun, 1 Dec 2013 12:10:24 +0000 (13:10 +0100)]
libzvbi-teletextdec: cosmetics

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoconfigure: Detect Solaris libc in an OpenIndiana/illumos compatible way
Diego Biurrun [Thu, 12 Dec 2013 11:14:30 +0000 (12:14 +0100)]
configure: Detect Solaris libc in an OpenIndiana/illumos compatible way

7 years agoexamples/decoding_encoding: check av_samples_get_buffer_size() return code
Timothy Gu [Sat, 14 Dec 2013 04:57:24 +0000 (20:57 -0800)]
examples/decoding_encoding: check av_samples_get_buffer_size() return code

Fixes CID1135756.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
7 years agoexamples/resample_audio: check av_samples_get_buffer_size() return code
Timothy Gu [Sat, 14 Dec 2013 04:57:23 +0000 (20:57 -0800)]
examples/resample_audio: check av_samples_get_buffer_size() return code

Fixes CID1135757.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
7 years agoffprobe: only show tags when explicitly requested
Stefano Sabatini [Thu, 12 Dec 2013 23:23:35 +0000 (00:23 +0100)]
ffprobe: only show tags when explicitly requested

7 years agolavf/movenc: return meaningful error code from mov_write_header()
Stefano Sabatini [Wed, 11 Dec 2013 11:18:00 +0000 (12:18 +0100)]
lavf/movenc: return meaningful error code from mov_write_header()

7 years agolavf/movenc: improve feedback in case of unsupported codec
Stefano Sabatini [Wed, 11 Dec 2013 11:13:12 +0000 (12:13 +0100)]
lavf/movenc: improve feedback in case of unsupported codec

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 14 Dec 2013 12:03:25 +0000 (13:03 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doxy: Define a group for libswscale documentation

Conflicts:
libavutil/avutil.h
libswscale/swscale.h

See: 18d9398143ac63915e85d76447dca5c9670ed58a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'a5a3b398fd9dce38ca50b20f182b17a256d209f2'
Michael Niedermayer [Sat, 14 Dec 2013 10:56:22 +0000 (11:56 +0100)]
Merge commit 'a5a3b398fd9dce38ca50b20f182b17a256d209f2'

* commit 'a5a3b398fd9dce38ca50b20f182b17a256d209f2':
  configure: Reorder pthreads checks

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '7cbe1ea9df83ec66403fbf6400353bcb2242bf06'
Michael Niedermayer [Sat, 14 Dec 2013 10:23:57 +0000 (11:23 +0100)]
Merge commit '7cbe1ea9df83ec66403fbf6400353bcb2242bf06'

* commit '7cbe1ea9df83ec66403fbf6400353bcb2242bf06':
  configure: Move the bz2 and zlib checks below phtreads

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '70a7b24d56a823894440a372c46e89e212b89c35'
Michael Niedermayer [Sat, 14 Dec 2013 10:13:51 +0000 (11:13 +0100)]
Merge commit '70a7b24d56a823894440a372c46e89e212b89c35'

* commit '70a7b24d56a823894440a372c46e89e212b89c35':
  avutil: Add deprecation ifdefs around obsolete intfloat code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/vc1: Factorize imode enum out / remove duplication
Michael Niedermayer [Sat, 14 Dec 2013 04:16:25 +0000 (05:16 +0100)]
avcodec/vc1: Factorize imode enum out / remove duplication

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohevc: rename ptl structs and variables
Guillaume Martres [Fri, 13 Dec 2013 19:05:26 +0000 (20:05 +0100)]
hevc: rename ptl structs and variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohevc: pack PTL representation using uint8_t
Guillaume Martres [Fri, 13 Dec 2013 19:05:25 +0000 (20:05 +0100)]
hevc: pack PTL representation using uint8_t

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohevc: remove unused PTL flags
Guillaume Martres [Fri, 13 Dec 2013 19:05:24 +0000 (20:05 +0100)]
hevc: remove unused PTL flags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohevc: don't check for errors in PTL code
Guillaume Martres [Fri, 13 Dec 2013 19:05:23 +0000 (20:05 +0100)]
hevc: don't check for errors in PTL code

The value of XXX_reserved_zero_44bits should be ignored, no need to
report an error when it's not zero.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohevc: fix PTL parsing
Guillaume Martres [Fri, 13 Dec 2013 19:05:22 +0000 (20:05 +0100)]
hevc: fix PTL parsing

This was broken in commit 36658c978f5d7df2ce556075946f3a80f7eca753

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale/x86/rgb2rgb: Make sure COMPILE_TEMPLATE_AVX is defined
Michael Niedermayer [Sat, 14 Dec 2013 01:54:28 +0000 (02:54 +0100)]
swscale/x86/rgb2rgb: Make sure COMPILE_TEMPLATE_AVX is defined

Found-by: iive
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale/x86/rgb2rgb_template: try to fix build without AVX
Michael Niedermayer [Sat, 14 Dec 2013 01:22:44 +0000 (02:22 +0100)]
swscale/x86/rgb2rgb_template: try to fix build without AVX

Found-by: iive
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/vc1dec: propagate errors from vc1_parse_sprites()
Michael Niedermayer [Sat, 14 Dec 2013 00:07:34 +0000 (01:07 +0100)]
avcodec/vc1dec: propagate errors from vc1_parse_sprites()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/vc1dec: zero SpriteData struct
Michael Niedermayer [Fri, 13 Dec 2013 23:58:18 +0000 (00:58 +0100)]
avcodec/vc1dec: zero SpriteData struct

Fixes use of uninitialized data, as alternative alpha could be
calculated conditionally

Fixes part of msan_uninit-mem_7f51a8b0b3b0_1009_Arlington.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/vc1dec: dont calculate unused values from uninitialized sprites
Michael Niedermayer [Fri, 13 Dec 2013 23:58:18 +0000 (00:58 +0100)]
avcodec/vc1dec: dont calculate unused values from uninitialized sprites

Fixes use of uninitialized data
Fixes part of msan_uninit-mem_7f51a8b0b3b0_1009_Arlington.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoxy: Define a group for libswscale documentation
Luca Barbato [Thu, 12 Dec 2013 18:53:00 +0000 (19:53 +0100)]
doxy: Define a group for libswscale documentation

Uniform the style and eliminate a warning on newer doxygen version..

7 years agoconfigure: Reorder pthreads checks
Luca Barbato [Thu, 12 Dec 2013 16:05:34 +0000 (17:05 +0100)]
configure: Reorder pthreads checks

Some pthreads symbols might be present in libc (as shown on various *BSD)
but not all of them, leading to false positives.

Check for the most common compiler flags before the plain symbol check
to avoid known pitfalls.

7 years agoconfigure: Move the bz2 and zlib checks below phtreads
Luca Barbato [Wed, 11 Dec 2013 13:21:48 +0000 (14:21 +0100)]
configure: Move the bz2 and zlib checks below phtreads

There are alternate implementations of those libraries that use pthreads.

7 years agoavutil: Add deprecation ifdefs around obsolete intfloat code
Diego Biurrun [Fri, 13 Dec 2013 12:34:07 +0000 (13:34 +0100)]
avutil: Add deprecation ifdefs around obsolete intfloat code

This long-deprecated code should disappear at the next version bump.

7 years agoavformat/asf: clear uninitialized areas of packets before returning them
Michael Niedermayer [Fri, 13 Dec 2013 21:31:49 +0000 (22:31 +0100)]
avformat/asf: clear uninitialized areas of packets before returning them

Fixes use of uninitialized variables
Fixes msan_uninit-mem_7f839282b6ce_7273_msn08_VBRq70_800x600.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 13 Dec 2013 20:33:13 +0000 (21:33 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: Merge pthreads/w32threads OBJS declarations

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '7c3388711b7243d059db39aa04b754baf2156934'
Michael Niedermayer [Fri, 13 Dec 2013 20:26:06 +0000 (21:26 +0100)]
Merge commit '7c3388711b7243d059db39aa04b754baf2156934'

* commit '7c3388711b7243d059db39aa04b754baf2156934':
  configure: Add -D__USE_MINGW_ANSI_STDIO=1 to CPPFLAGS on MinGW32

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'bdc111a162094c14660d1e88839d103a4d79e42a'
Michael Niedermayer [Fri, 13 Dec 2013 19:49:09 +0000 (20:49 +0100)]
Merge commit 'bdc111a162094c14660d1e88839d103a4d79e42a'

* commit 'bdc111a162094c14660d1e88839d103a4d79e42a':
  configure: Detect newer (>=4.1) versions of MinGW32

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'a1d7d5524799bd90bc5d12e8b3063238cc0c02dd'
Michael Niedermayer [Fri, 13 Dec 2013 19:34:40 +0000 (20:34 +0100)]
Merge commit 'a1d7d5524799bd90bc5d12e8b3063238cc0c02dd'

* commit 'a1d7d5524799bd90bc5d12e8b3063238cc0c02dd':
  build: Do not add -g to HOSTCFLAGS

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: remove redundant definition of __USE_MINGW_ANSI_STDIO
James Almer [Fri, 13 Dec 2013 19:14:20 +0000 (16:14 -0300)]
configure: remove redundant definition of __USE_MINGW_ANSI_STDIO

No need to define it twice on mingw-w64 >= v3.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agoavcodec/mjpegdec: use mallocz for progressive blocks
Michael Niedermayer [Fri, 13 Dec 2013 19:25:38 +0000 (20:25 +0100)]
avcodec/mjpegdec: use mallocz for progressive blocks

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f849c599487_6828_mjpeg.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/ipmovie: Fix use of uninitialized memory in OPCODE_INIT_VIDEO_BUFFERS
Michael Niedermayer [Fri, 13 Dec 2013 18:50:34 +0000 (19:50 +0100)]
avformat/ipmovie: Fix use of uninitialized memory in OPCODE_INIT_VIDEO_BUFFERS

Fixes: msan_uninit-mem_7ffe323a25f3_5929_ipmovie_interplayvideo_interplay_dpcm__bislogo.mve
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/network: check ff_socket_nonblock() return and print a debug message
Michael Niedermayer [Mon, 21 Oct 2013 15:23:35 +0000 (17:23 +0200)]
avformat/network: check ff_socket_nonblock() return and print a debug message

Fixes CID1026744
Fixes CID1026743

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavcodec/dvbsub: fix for Display Definition Segment
Pierre Yves MORDRET [Fri, 13 Dec 2013 13:29:09 +0000 (14:29 +0100)]
libavcodec/dvbsub: fix for Display Definition Segment

Given ETSI EN 300 743 V1.3.1 (2006-11), 7.2.1 Display definition segment
display window parameters are given in this order XMin, XMax, YMin, YMax
if  display_window_flag is set, but here this is not the case.
As a consequence the DVB subtitles are not displayed upon some videos.

Signed-off-by: Pierre-Yves MORDRET <pierre-yves.mordret@st.com>
Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: Merge pthreads/w32threads OBJS declarations
Diego Biurrun [Thu, 12 Dec 2013 15:27:30 +0000 (16:27 +0100)]
build: Merge pthreads/w32threads OBJS declarations

7 years agoconfigure: Add -D__USE_MINGW_ANSI_STDIO=1 to CPPFLAGS on MinGW32
Diego Biurrun [Wed, 11 Dec 2013 23:39:43 +0000 (00:39 +0100)]
configure: Add -D__USE_MINGW_ANSI_STDIO=1 to CPPFLAGS on MinGW32

This enables a more C99-compliant implementation of printf et al.

7 years agoconfigure: Detect newer (>=4.1) versions of MinGW32
Diego Biurrun [Wed, 11 Dec 2013 23:34:43 +0000 (00:34 +0100)]
configure: Detect newer (>=4.1) versions of MinGW32

The MinGW32 project is deprecating its old version macros.

7 years agobuild: Do not add -g to HOSTCFLAGS
Diego Biurrun [Wed, 11 Dec 2013 23:04:27 +0000 (00:04 +0100)]
build: Do not add -g to HOSTCFLAGS

The flag is not unconditionally added to CFLAGS either and the
programs built on the host do not get habitually fed to a debugger.

7 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Fri, 13 Dec 2013 14:44:39 +0000 (15:44 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Force one stream in caf muxer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/vf_pullup: fix memleak on error
Michael Niedermayer [Fri, 13 Dec 2013 14:14:03 +0000 (15:14 +0100)]
avfilter/vf_pullup: fix memleak on error

Fixes CID1108604

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/vf_pullup: Factor free_field_queue() out
Michael Niedermayer [Fri, 13 Dec 2013 14:13:01 +0000 (15:13 +0100)]
avfilter/vf_pullup: Factor free_field_queue() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoForce one stream in caf muxer.
Carl Eugen Hoyos [Fri, 13 Dec 2013 10:57:39 +0000 (11:57 +0100)]
Force one stream in caf muxer.

Based on eeb975f5

7 years agoexamples/demuxing_decoding: print the decoding error when it happens.
Clément Bœsch [Fri, 13 Dec 2013 09:36:52 +0000 (10:36 +0100)]
examples/demuxing_decoding: print the decoding error when it happens.

7 years agoexamples/demuxing_decoding: return error when no codec found
Even Wiik Thomassen [Fri, 13 Dec 2013 08:24:18 +0000 (09:24 +0100)]
examples/demuxing_decoding: return error when no codec found

The open_codec_context function, when it fails to find a codec, now
return AVERROR(EINVAL) to signal an error.

Before it would return the stream index, which was always >= 0, and
continue as if a codec was found. This change make it fail faster,
instead of repeated failed tries to decode frames with no codec.

Signed-off-by: Even Wiik Thomassen <e.thomassen@sportradar.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agoffprobe: add cosmetical empty line
Stefano Sabatini [Thu, 12 Dec 2013 23:18:04 +0000 (00:18 +0100)]
ffprobe: add cosmetical empty line

7 years agoffserver: improve error feedback in case of av_write_frame() error
Stefano Sabatini [Tue, 10 Dec 2013 19:11:28 +0000 (20:11 +0100)]
ffserver: improve error feedback in case of av_write_frame() error

7 years agoMAINTAINERS: remove ffserver maintainership status notice
Stefano Sabatini [Wed, 27 Nov 2013 13:29:19 +0000 (14:29 +0100)]
MAINTAINERS: remove ffserver maintainership status notice

Privately approved by Baptiste.

7 years agodocs/outdevs: add a few simple ALSA examples
Lou Logan [Tue, 10 Dec 2013 23:49:26 +0000 (14:49 -0900)]
docs/outdevs: add a few simple ALSA examples

7 years agoavformat/rtpenc: check av_packet_get_side_data() return, fix null ptr dereference
Michael Niedermayer [Fri, 13 Dec 2013 00:33:35 +0000 (01:33 +0100)]
avformat/rtpenc: check av_packet_get_side_data() return, fix null ptr dereference

Fixes CID1035715

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/rtpdec_h264: fix null pointer dereferences
Michael Niedermayer [Fri, 13 Dec 2013 00:27:26 +0000 (01:27 +0100)]
avformat/rtpdec_h264: fix null pointer dereferences

Fixes CID733716

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/sdp: fix memleak on error
Michael Niedermayer [Thu, 12 Dec 2013 23:27:25 +0000 (00:27 +0100)]
avformat/sdp: fix memleak on error

Fixes CID700640
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/hevc_sei: fix use of uninitialized variables in decode_nal_sei_frame_packing_...
Michael Niedermayer [Thu, 12 Dec 2013 22:51:39 +0000 (23:51 +0100)]
avcodec/hevc_sei: fix use of uninitialized variables in decode_nal_sei_frame_packing_arrangement()

Fixes CID1135773/1135774/1135775
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavformat/hdsenc: check init_file() return code
Michael Niedermayer [Thu, 12 Dec 2013 20:04:24 +0000 (21:04 +0100)]
libavformat/hdsenc: check init_file() return code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 12 Dec 2013 19:05:52 +0000 (20:05 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegts: add HEVC registration descriptor

Conflicts:
libavformat/mpegts.c

See: d0b7d24b80b390b2013adc3c8e0e2063836ee293
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c'
Michael Niedermayer [Thu, 12 Dec 2013 18:55:06 +0000 (19:55 +0100)]
Merge commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c'

* commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c':
  changelog: drop redundant new attribute

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a'
Michael Niedermayer [Thu, 12 Dec 2013 18:48:36 +0000 (19:48 +0100)]
Merge commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a'

* commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a':
  img2: add stereo 3d still picture file extensions

Conflicts:
libavformat/img2.c

See: 6fe12c7ff2094c68a8b6e9aeea7744ca15594091
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39'
Michael Niedermayer [Thu, 12 Dec 2013 18:36:09 +0000 (19:36 +0100)]
Merge commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39'

* commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39':
  rtsp: suppress a incompatible pointer types warning

Conflicts:
libavformat/rtsp.c

See: 00792322990188b1130ef2befd68ec1d51ab7365
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '6b45f05ef5b241fd1513702119af9c30056a0ac5'
Michael Niedermayer [Thu, 12 Dec 2013 18:11:07 +0000 (19:11 +0100)]
Merge commit '6b45f05ef5b241fd1513702119af9c30056a0ac5'

* commit '6b45f05ef5b241fd1513702119af9c30056a0ac5':
  parseutils: fix discarding const attribute warning

Conflicts:
libavutil/parseutils.c

See: fe87b2e79c734a111747a239943c7340f8d3f7d7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/hlsenc: copy metadata
Michael Niedermayer [Thu, 12 Dec 2013 17:41:39 +0000 (18:41 +0100)]
avformat/hlsenc: copy metadata

Fixes Ticket2296

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>