ffmpeg.git
4 years agoavfilter/vf_spp: add support for 9bit YUV and GBR as well as GBRP10
Michael Niedermayer [Sat, 20 Dec 2014 17:33:52 +0000 (18:33 +0100)]
avfilter/vf_spp: add support for 9bit YUV and GBR as well as GBRP10

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/idctdsp: use the 10bit code for 9 bit too
Michael Niedermayer [Sat, 20 Dec 2014 17:32:50 +0000 (18:32 +0100)]
avcodec/idctdsp: use the 10bit code for 9 bit too

9bit is currently not used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/fdctdsp: use the 10bit code for 9 bit too
Michael Niedermayer [Sat, 20 Dec 2014 17:32:50 +0000 (18:32 +0100)]
avcodec/fdctdsp: use the 10bit code for 9 bit too

9bit is currently not used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mmst: Use av_freep() avoid leaving stale pointers in memory
Michael Niedermayer [Sat, 20 Dec 2014 15:54:25 +0000 (16:54 +0100)]
avformat/mmst: Use av_freep() avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/http: Use av_freep() avoid leaving stale pointers in memory
Michael Niedermayer [Sat, 20 Dec 2014 15:53:37 +0000 (16:53 +0100)]
avformat/http: Use av_freep() avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/id3v2: Use av_freep() avoid leaving stale pointers in memory
Michael Niedermayer [Sat, 20 Dec 2014 15:53:14 +0000 (16:53 +0100)]
avformat/id3v2: Use av_freep() avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86/vp3dsp: port put_vp_no_rnd_pixels8_l2_mmx to yasm
James Almer [Sat, 20 Dec 2014 06:18:57 +0000 (03:18 -0300)]
x86/vp3dsp: port put_vp_no_rnd_pixels8_l2_mmx to yasm

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMakefile: add dependencies which require ffversion.h
Michael Niedermayer [Sat, 20 Dec 2014 03:09:01 +0000 (04:09 +0100)]
Makefile: add dependencies which require ffversion.h

Without this ffversion.h could sometimes be built too late

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/westwood_aud: replace != 0 error check by <0
Michael Niedermayer [Sat, 20 Dec 2014 00:51:16 +0000 (01:51 +0100)]
avformat/westwood_aud: replace != 0 error check by <0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/asfenc: replace != 0 error check by <0
Michael Niedermayer [Sat, 20 Dec 2014 00:48:26 +0000 (01:48 +0100)]
avformat/asfenc: replace != 0 error check by <0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8ebf02f8f530240edf7e45f35f7647ef9dd44a58'
Michael Niedermayer [Fri, 19 Dec 2014 23:49:12 +0000 (00:49 +0100)]
Merge commit '8ebf02f8f530240edf7e45f35f7647ef9dd44a58'

* commit '8ebf02f8f530240edf7e45f35f7647ef9dd44a58':
  libavformat: Only use MoveFileExA when targeting the desktop API subset

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'fc308b30bb24e623fed042ec78b10803b2362a18'
Michael Niedermayer [Fri, 19 Dec 2014 23:41:45 +0000 (00:41 +0100)]
Merge commit 'fc308b30bb24e623fed042ec78b10803b2362a18'

* commit 'fc308b30bb24e623fed042ec78b10803b2362a18':
  rtpenc_mpegts: Call write_trailer for the mpegts muxer even if no output buffer exists

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa'
Michael Niedermayer [Fri, 19 Dec 2014 23:33:08 +0000 (00:33 +0100)]
Merge commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa'

* commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa':
  mpegts: Support running the write_trailer function without an AVIOContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4895aa65c6ddec2e33ec3c023f221b1bafcbaf9f'
Michael Niedermayer [Fri, 19 Dec 2014 23:16:13 +0000 (00:16 +0100)]
Merge commit '4895aa65c6ddec2e33ec3c023f221b1bafcbaf9f'

* commit '4895aa65c6ddec2e33ec3c023f221b1bafcbaf9f':
  libavformat: Allow calling av_write_trailer with a NULL AVIOContext

Conflicts:
libavformat/mux.c

See: 277f20c3c877a74aca9d480480024a6d66c9fbc4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rsd: make tag_buf string larger
Clément Bœsch [Fri, 19 Dec 2014 23:17:43 +0000 (00:17 +0100)]
avformat/rsd: make tag_buf string larger

av_get_codec_tag_string() uses more that 1 char for unprintable characters.

4 years agoavformat/apngdec: make tag_buf string larger
Clément Bœsch [Fri, 19 Dec 2014 23:17:21 +0000 (00:17 +0100)]
avformat/apngdec: make tag_buf string larger

av_get_codec_tag_string() uses more that 1 char for unprintable characters.

4 years agoavformat/wavdec: make start_code string larger
Clément Bœsch [Fri, 19 Dec 2014 22:57:39 +0000 (23:57 +0100)]
avformat/wavdec: make start_code string larger

av_get_codec_tag_string() uses more that 1 char for unprintable characters.

4 years agowavdec: avoid output of arbitrary chars
Thomas Volkert [Fri, 19 Dec 2014 22:39:01 +0000 (23:39 +0100)]
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>
4 years agowavdec: refactor wav_read_header()
Thomas Volkert [Fri, 19 Dec 2014 20:57:05 +0000 (21:57 +0100)]
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>
4 years agolibavformat: Only use MoveFileExA when targeting the desktop API subset
Martin Storsjö [Mon, 15 Dec 2014 21:55:30 +0000 (23:55 +0200)]
libavformat: Only use MoveFileExA when targeting the desktop API subset

The MoveFileExA is available in the headers regardless which API
subset is targeted, but it is missing in the Windows Phone link
libraries. When targeting Windows Store apps, the function is
available both in the headers and in the link libraries, and thus
there is no indication for the build system that this function
should be avoided - such an indication is only given by the
Windows App Certification Kit, which forbids using the MoveFileExA
function.

Therefore check the WINAPI_FAMILY defines instead, to figure out
which API subset is targeted.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpenc_mpegts: Call write_trailer for the mpegts muxer even if no output buffer exists
Martin Storsjö [Fri, 19 Dec 2014 13:26:23 +0000 (15:26 +0200)]
rtpenc_mpegts: Call write_trailer for the mpegts muxer even if no output buffer exists

Since the mpegts muxer now can handle being called with a NULL
AVIOContext, we don't need to try to allocate one before calling
write_trailer.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agompegts: Support running the write_trailer function without an AVIOContext
Martin Storsjö [Fri, 19 Dec 2014 13:23:06 +0000 (15:23 +0200)]
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>
4 years agolibavformat: Allow calling av_write_trailer with a NULL AVIOContext
Martin Storsjö [Fri, 19 Dec 2014 13:40:02 +0000 (15:40 +0200)]
libavformat: Allow calling av_write_trailer with a NULL AVIOContext

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavcodec/vp3: Fix offset handling
Michael Niedermayer [Fri, 19 Dec 2014 19:53:53 +0000 (20:53 +0100)]
avcodec/vp3: Fix offset handling

Fixes use of uninitialized memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo_enc: remove rtp_mode=0 for H261
Michael Niedermayer [Thu, 18 Dec 2014 22:32:42 +0000 (23:32 +0100)]
avcodec/mpegvideo_enc: remove rtp_mode=0 for H261

Suggested-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86/constants: fix alignment of pw_255
James Almer [Fri, 19 Dec 2014 19:18:43 +0000 (16:18 -0300)]
x86/constants: fix alignment of pw_255

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoAdd FFMPEG_VERSION into the binary libs
Michael Niedermayer [Fri, 19 Dec 2014 17:04:40 +0000 (18:04 +0100)]
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>
4 years agoavformat/mpegenc: replace always enabled asserts by av_assert0()
Michael Niedermayer [Fri, 19 Dec 2014 14:08:44 +0000 (15:08 +0100)]
avformat/mpegenc: replace always enabled asserts by av_assert0()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vsrc_life: Use av_freep() avoid leaving stale pointers in memory
Michael Niedermayer [Fri, 19 Dec 2014 14:04:56 +0000 (15:04 +0100)]
avfilter/vsrc_life: Use av_freep() avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_libopencv: use av_freep() avoid leaving stale pointers in memory
Michael Niedermayer [Fri, 19 Dec 2014 14:04:34 +0000 (15:04 +0100)]
avfilter/vf_libopencv: use av_freep() avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavutil: Added cbc mode to cast128
Supraja Meedinti [Thu, 18 Dec 2014 09:56:32 +0000 (15:26 +0530)]
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>
4 years agovp9/x86: intra prediction sse2/32bit support.
Ronald S. Bultje [Tue, 16 Dec 2014 03:13:52 +0000 (22:13 -0500)]
vp9/x86: intra prediction sse2/32bit support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovp9/x86: invert hu_ipred left array ordering.
Ronald S. Bultje [Tue, 16 Dec 2014 03:12:50 +0000 (22:12 -0500)]
vp9/x86: invert hu_ipred left array ordering.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'cee4490b521fd0d02476d46aa2598af24fb8d686'
Michael Niedermayer [Fri, 19 Dec 2014 12:36:25 +0000 (13:36 +0100)]
Merge commit 'cee4490b521fd0d02476d46aa2598af24fb8d686'

* commit 'cee4490b521fd0d02476d46aa2598af24fb8d686':
  on2avc: check number of channels

See: 550f3e9df3410b3dd975e590042c0d83e20a8da3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd423dd72be451462c6fb1cbbe313bed0194001ab'
Michael Niedermayer [Fri, 19 Dec 2014 12:30:25 +0000 (13:30 +0100)]
Merge commit 'd423dd72be451462c6fb1cbbe313bed0194001ab'

* commit 'd423dd72be451462c6fb1cbbe313bed0194001ab':
  smc: fix the bounds check

Conflicts:
libavcodec/smc.c

See: c727401aa9d62335e89d118a5b4e202edf39d905
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0b39ac6f54505a538c21fe49a626de94c518c903'
Michael Niedermayer [Fri, 19 Dec 2014 12:14:09 +0000 (13:14 +0100)]
Merge commit '0b39ac6f54505a538c21fe49a626de94c518c903'

* commit '0b39ac6f54505a538c21fe49a626de94c518c903':
  gifdec: refactor interleave end handling

Conflicts:
libavcodec/gifdec.c

See: 8f1457864be8fb9653643519dea1c6492f1dde57
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/rtp_h261: Replace restrict with av_restrict.
Carl Eugen Hoyos [Fri, 19 Dec 2014 12:25:51 +0000 (13:25 +0100)]
lavf/rtp_h261: Replace restrict with av_restrict.

Fixes compilation on Windows.

4 years agoMerge commit '17ba719d9ba30c970f65747f42d5fbb1e447ca28'
Michael Niedermayer [Fri, 19 Dec 2014 12:04:35 +0000 (13:04 +0100)]
Merge commit '17ba719d9ba30c970f65747f42d5fbb1e447ca28'

* commit '17ba719d9ba30c970f65747f42d5fbb1e447ca28':
  mmvideo: check frame dimensions

See: 8b0e96e1f21b761ca15dbb470cd619a1ebf86c3e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '88626e5af8d006e67189bf10b96b982502a7e8ad'
Michael Niedermayer [Fri, 19 Dec 2014 11:56:08 +0000 (12:56 +0100)]
Merge commit '88626e5af8d006e67189bf10b96b982502a7e8ad'

* commit '88626e5af8d006e67189bf10b96b982502a7e8ad':
  jvdec: check frame dimensions

See: 105654e376a736d243aef4a1d121abebce912e6b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '809c3023b699c54c90511913d3b6140dd2436550'
Michael Niedermayer [Fri, 19 Dec 2014 11:45:56 +0000 (12:45 +0100)]
Merge commit '809c3023b699c54c90511913d3b6140dd2436550'

* commit '809c3023b699c54c90511913d3b6140dd2436550':
  mjpegdec: check for pixel format changes

Conflicts:
libavcodec/mjpegdec.c

See: 5c378d6a6df8243f06c87962b873bd563e58cd39
See: a2f680c7bc7642c687aeb4e14d00ac74833c7a09
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '64f7575fbd64e5b65d5c644347408588c776f1fe'
Michael Niedermayer [Fri, 19 Dec 2014 11:24:36 +0000 (12:24 +0100)]
Merge commit '64f7575fbd64e5b65d5c644347408588c776f1fe'

* commit '64f7575fbd64e5b65d5c644347408588c776f1fe':
  mov: avoid a memleak when multiple stss boxes are present

Conflicts:
libavformat/mov.c

See: 5ab882d7283f57560c889919c35f2688253b1d9c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoon2avc: check number of channels
Michael Niedermayer [Sat, 4 Oct 2014 20:15:07 +0000 (22:15 +0200)]
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>
4 years agosmc: fix the bounds check
Michael Niedermayer [Fri, 3 Oct 2014 20:50:45 +0000 (22:50 +0200)]
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>
4 years agogifdec: refactor interleave end handling
Michael Niedermayer [Fri, 3 Oct 2014 18:15:52 +0000 (20:15 +0200)]
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>
4 years agommvideo: check frame dimensions
Anton Khirnov [Sun, 14 Dec 2014 20:01:59 +0000 (21:01 +0100)]
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
4 years agojvdec: check frame dimensions
Anton Khirnov [Sun, 14 Dec 2014 20:01:59 +0000 (21:01 +0100)]
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
4 years agomjpegdec: check for pixel format changes
Anton Khirnov [Sun, 14 Dec 2014 19:52:13 +0000 (20:52 +0100)]
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
4 years agomov: avoid a memleak when multiple stss boxes are present
Anton Khirnov [Tue, 12 Aug 2014 14:39:10 +0000 (14:39 +0000)]
mov: avoid a memleak when multiple stss boxes are present

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
4 years agoMerge commit '210461c0a83a5625560fa1d92229200dc7fb869b'
Michael Niedermayer [Fri, 19 Dec 2014 04:37:11 +0000 (05:37 +0100)]
Merge commit '210461c0a83a5625560fa1d92229200dc7fb869b'

* commit '210461c0a83a5625560fa1d92229200dc7fb869b':
  imgconvert: check memory allocations and propagate errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '596b5c488fa1d40f114a64d3b73e1863cab073fb'
Michael Niedermayer [Fri, 19 Dec 2014 04:36:20 +0000 (05:36 +0100)]
Merge commit '596b5c488fa1d40f114a64d3b73e1863cab073fb'

* commit '596b5c488fa1d40f114a64d3b73e1863cab073fb':
  wma: check memory allocations and propagate errors

Conflicts:
libavcodec/wma.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '63be97ec403023fb664798432acedaf6e6922527'
Michael Niedermayer [Fri, 19 Dec 2014 04:15:40 +0000 (05:15 +0100)]
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>
4 years agoMerge commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788'
Michael Niedermayer [Fri, 19 Dec 2014 04:13:59 +0000 (05:13 +0100)]
Merge commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788'

* commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788':
  xcbgrab: Move NULL check before pointer dereference

Conflicts:
libavdevice/xcbgrab.c

See: e86df0206f06b8d1e97e2b60db8f74a398d53127
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5ac06633cb63fcc51f2471a3478b44d3f010b16b'
Michael Niedermayer [Fri, 19 Dec 2014 04:06:07 +0000 (05:06 +0100)]
Merge commit '5ac06633cb63fcc51f2471a3478b44d3f010b16b'

* commit '5ac06633cb63fcc51f2471a3478b44d3f010b16b':
  takdec: check av_samples_get_buffer_size() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '16c7a8a142277aa3c98b4802ee57daaebe6999e5'
Michael Niedermayer [Fri, 19 Dec 2014 04:04:43 +0000 (05:04 +0100)]
Merge commit '16c7a8a142277aa3c98b4802ee57daaebe6999e5'

* commit '16c7a8a142277aa3c98b4802ee57daaebe6999e5':
  aacps: invert the order of parameters of ipdopd_reset()

See: 9f36ec6aa936515a703f6d7ff32826aa28684f1e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '76ccf114a6c107218e2a1948afc1d0fb3ac7ba0b'
Michael Niedermayer [Fri, 19 Dec 2014 04:04:19 +0000 (05:04 +0100)]
Merge commit '76ccf114a6c107218e2a1948afc1d0fb3ac7ba0b'

* commit '76ccf114a6c107218e2a1948afc1d0fb3ac7ba0b':
  rtsp: check ffurl_get_file_handle() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e'
Michael Niedermayer [Fri, 19 Dec 2014 03:57:25 +0000 (04:57 +0100)]
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>
4 years agoMerge commit '9745f19ffc9031ce480e43d7cf1053b58100d70f'
Michael Niedermayer [Fri, 19 Dec 2014 03:53:39 +0000 (04:53 +0100)]
Merge commit '9745f19ffc9031ce480e43d7cf1053b58100d70f'

* commit '9745f19ffc9031ce480e43d7cf1053b58100d70f':
  assdec: check the right variable

Conflicts:
libavcodec/assdec.c

See: cc7342f712c0822c3e8f4c36fc55632c59aabac9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '971099ff5a85377579eb5b8d3620e283957f097e'
Michael Niedermayer [Fri, 19 Dec 2014 03:44:39 +0000 (04:44 +0100)]
Merge commit '971099ff5a85377579eb5b8d3620e283957f097e'

* commit '971099ff5a85377579eb5b8d3620e283957f097e':
  aacenc: correctly check returned value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d'
Michael Niedermayer [Fri, 19 Dec 2014 03:43:53 +0000 (04:43 +0100)]
Merge commit 'ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d'

* commit 'ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d':
  lcl: return an appropriate error code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8b263331c5ebbb10b6ea521e9fd56751ba94254b'
Michael Niedermayer [Fri, 19 Dec 2014 03:42:59 +0000 (04:42 +0100)]
Merge commit '8b263331c5ebbb10b6ea521e9fd56751ba94254b'

* commit '8b263331c5ebbb10b6ea521e9fd56751ba94254b':
  mpegts: check get16() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '430a8168594b3cb29f44141d4da88f2c642de06f'
Michael Niedermayer [Fri, 19 Dec 2014 03:36:27 +0000 (04:36 +0100)]
Merge commit '430a8168594b3cb29f44141d4da88f2c642de06f'

* commit '430a8168594b3cb29f44141d4da88f2c642de06f':
  oggdec: add support for VP8 demuxing

Conflicts:
Changelog
libavformat/oggparsevp8.c
libavformat/version.h

See: d890db5f537bdfc9d73e7fdac1ff4216e5a43fc2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '38129c26c51b933d7db423f904ba0cd6a88ca1ed'
Michael Niedermayer [Fri, 19 Dec 2014 03:30:25 +0000 (04:30 +0100)]
Merge commit '38129c26c51b933d7db423f904ba0cd6a88ca1ed'

* commit '38129c26c51b933d7db423f904ba0cd6a88ca1ed':
  cmdutils: check file access functions return values

Conflicts:
cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c63dd3f0a48a9f6389d253597ab51caddc0118db'
Michael Niedermayer [Fri, 19 Dec 2014 03:21:13 +0000 (04:21 +0100)]
Merge commit 'c63dd3f0a48a9f6389d253597ab51caddc0118db'

* commit 'c63dd3f0a48a9f6389d253597ab51caddc0118db':
  a64multi: check elbg return values

Conflicts:
libavcodec/a64multienc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3beb9cbad35218ed1fb3473eeb3cfc97a931bff4'
Michael Niedermayer [Fri, 19 Dec 2014 03:19:58 +0000 (04:19 +0100)]
Merge commit '3beb9cbad35218ed1fb3473eeb3cfc97a931bff4'

* commit '3beb9cbad35218ed1fb3473eeb3cfc97a931bff4':
  roqvideo: check memory allocations and propagate errors

Conflicts:
libavcodec/roqvideoenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ae2d41ec875965ce4ab9fdd88a5e8ba57cada67a'
Michael Niedermayer [Fri, 19 Dec 2014 03:10:17 +0000 (04:10 +0100)]
Merge commit 'ae2d41ec875965ce4ab9fdd88a5e8ba57cada67a'

* commit 'ae2d41ec875965ce4ab9fdd88a5e8ba57cada67a':
  elbg: check memory allocations and propagate errors

Conflicts:
libavcodec/elbg.c
libavcodec/elbg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5d839778b9f3edb682b7f71dde4f80f07c75b098'
Michael Niedermayer [Fri, 19 Dec 2014 02:57:12 +0000 (03:57 +0100)]
Merge commit '5d839778b9f3edb682b7f71dde4f80f07c75b098'

* commit '5d839778b9f3edb682b7f71dde4f80f07c75b098':
  lavu: Refactor side data wiping

Conflicts:
libavutil/frame.c

See: a400edbb6d00c0211de38e4f1b4f593681db91d8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'effa7d2a6a260ca3ce801c180ee6131d67d665fb'
Michael Niedermayer [Fri, 19 Dec 2014 02:42:43 +0000 (03:42 +0100)]
Merge commit 'effa7d2a6a260ca3ce801c180ee6131d67d665fb'

* commit 'effa7d2a6a260ca3ce801c180ee6131d67d665fb':
  fate: add test for offset theora

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '67fc8a15e4182ea111cfcd05897709f09d99a33a'
Michael Niedermayer [Fri, 19 Dec 2014 02:42:16 +0000 (03:42 +0100)]
Merge commit '67fc8a15e4182ea111cfcd05897709f09d99a33a'

* commit '67fc8a15e4182ea111cfcd05897709f09d99a33a':
  theora: support different visible and coded frame size

Conflicts:
libavcodec/vp3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a381e0cec87bcb28ebc05fe840bb937a495de736'
Michael Niedermayer [Fri, 19 Dec 2014 02:31:08 +0000 (03:31 +0100)]
Merge commit 'a381e0cec87bcb28ebc05fe840bb937a495de736'

* commit 'a381e0cec87bcb28ebc05fe840bb937a495de736':
  fate: add a DPX parser test

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '87bd298abeb901fe16383a0d267502cc7fc03878'
Michael Niedermayer [Fri, 19 Dec 2014 02:29:30 +0000 (03:29 +0100)]
Merge commit '87bd298abeb901fe16383a0d267502cc7fc03878'

* commit '87bd298abeb901fe16383a0d267502cc7fc03878':
  DPX parser

Conflicts:
libavcodec/dpx_parser.c
libavcodec/version.h

See: 8ec328668a7d10c8224ae5f591add5b388ea82ed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3a3790b8f8b56ee6abc93ccac280eb693675e294'
Michael Niedermayer [Fri, 19 Dec 2014 02:13:31 +0000 (03:13 +0100)]
Merge commit '3a3790b8f8b56ee6abc93ccac280eb693675e294'

* commit '3a3790b8f8b56ee6abc93ccac280eb693675e294':
  tiff: support encoding and decoding 64bit images

Conflicts:
libavcodec/tiff.c
libavcodec/tiffenc.c
libavcodec/version.h

See: c714cd3bd4af70e0cba1db399ca420b1f51a773d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '59f0275dd0a42a7f90271a83a78e9ca5e69ff5b0'
Michael Niedermayer [Fri, 19 Dec 2014 01:56:45 +0000 (02:56 +0100)]
Merge commit '59f0275dd0a42a7f90271a83a78e9ca5e69ff5b0'

* commit '59f0275dd0a42a7f90271a83a78e9ca5e69ff5b0':
  movenc: Adjust the pts of new fragments similarly to what is done for dts

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a'
Michael Niedermayer [Fri, 19 Dec 2014 01:49:36 +0000 (02:49 +0100)]
Merge commit '8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a'

* commit '8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a':
  libavformat: Add a muxer wrapping mpegts encoding into RTP

Conflicts:
Changelog
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a505c0d7373336a4cc5aa2022111c46bdd388b1f'
Michael Niedermayer [Fri, 19 Dec 2014 01:33:15 +0000 (02:33 +0100)]
Merge commit 'a505c0d7373336a4cc5aa2022111c46bdd388b1f'

* commit 'a505c0d7373336a4cc5aa2022111c46bdd388b1f':
  rtp: Initial H.261 support

Conflicts:
Changelog
libavformat/rtpdec_h261.c
libavformat/rtpenc_h261.c
libavformat/sdp.c
libavformat/version.h

See: 50a4d5cfc6749932347ee38c25b5040aea4b13a0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'adc214e6797750285a5e62634b8521db521162ad'
Michael Niedermayer [Fri, 19 Dec 2014 01:24:02 +0000 (02:24 +0100)]
Merge commit 'adc214e6797750285a5e62634b8521db521162ad'

* commit 'adc214e6797750285a5e62634b8521db521162ad':
  rtpenc: Avoid brittle switch fallthroughs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3bb465245fed6069512e6821000391beae8a6066'
Michael Niedermayer [Fri, 19 Dec 2014 01:15:19 +0000 (02:15 +0100)]
Merge commit '3bb465245fed6069512e6821000391beae8a6066'

* commit '3bb465245fed6069512e6821000391beae8a6066':
  h261dec: Fix context initialization sequence

See: 6c1ee1a11446abbe662fc89b9dff0f0a3d5fdd55
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoqdm2: Allow hard-coding VLC tables.
Reimar Döffinger [Sun, 7 Sep 2014 11:55:23 +0000 (13:55 +0200)]
qdm2: Allow hard-coding VLC tables.

Also adds a lot of infrastructure necessary for it.
Some of it is a bit ugly though.
Increases binary size for hardcoded tables by about 12 kB,
which is about 15 kB from qdm2_table minus data and code
saved that was only used for creating it.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
4 years agoaacps.c: Move large arrays to context to reduce stack usage.
Reimar Döffinger [Sat, 22 Nov 2014 20:26:45 +0000 (21:26 +0100)]
aacps.c: Move large arrays to context to reduce stack usage.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
4 years agoimgconvert: check memory allocations and propagate errors
Vittorio Giovara [Wed, 17 Dec 2014 15:01:45 +0000 (16:01 +0100)]
imgconvert: check memory allocations and propagate errors

4 years agowma: check memory allocations and propagate errors
Vittorio Giovara [Wed, 17 Dec 2014 15:01:46 +0000 (16:01 +0100)]
wma: check memory allocations and propagate errors

4 years agolavfi: always check av_expr_parse_and_eval() return value
Vittorio Giovara [Wed, 17 Dec 2014 14:19:43 +0000 (15:19 +0100)]
lavfi: always check av_expr_parse_and_eval() return value

CC: libav-stable@libav.org
Bug-Id: CID 703624

4 years agoxcbgrab: Move NULL check before pointer dereference
Vittorio Giovara [Wed, 17 Dec 2014 14:19:41 +0000 (15:19 +0100)]
xcbgrab: Move NULL check before pointer dereference

Bug-Id: CID 1254668

4 years agotakdec: check av_samples_get_buffer_size() return value
Vittorio Giovara [Wed, 17 Dec 2014 14:19:42 +0000 (15:19 +0100)]
takdec: check av_samples_get_buffer_size() return value

CC: libav-stable@libav.org
Bug-Id: CID 747734

4 years agoaacps: invert the order of parameters of ipdopd_reset()
Vittorio Giovara [Wed, 17 Dec 2014 14:19:40 +0000 (15:19 +0100)]
aacps: invert the order of parameters of ipdopd_reset()

This is the order that the caller uses in the rest of the file. The
same operation is applied to both parameters, so this change is only
done for consistency, it doesn't change the actual behaviour.

Bug-Id: CID 732285 / CID 732286

4 years agortsp: check ffurl_get_file_handle() return value
Vittorio Giovara [Wed, 17 Dec 2014 14:19:39 +0000 (15:19 +0100)]
rtsp: check ffurl_get_file_handle() return value

CC: libav-stable@libav.org
Bug-Id: CID 717844

4 years agocheck memory errors from av_strdup()
Vittorio Giovara [Wed, 17 Dec 2014 13:53:45 +0000 (14:53 +0100)]
check memory errors from av_strdup()

4 years agoassdec: check the right variable
Vittorio Giovara [Wed, 17 Dec 2014 13:53:44 +0000 (14:53 +0100)]
assdec: check the right variable

CC: libav-stable@libav.org
Bug-Id: CID 1257815

4 years agoaacenc: correctly check returned value
Vittorio Giovara [Wed, 17 Dec 2014 13:53:43 +0000 (14:53 +0100)]
aacenc: correctly check returned value

CC: libav-stable@libav.org
4 years agolcl: return an appropriate error code
Vittorio Giovara [Wed, 17 Dec 2014 13:53:42 +0000 (14:53 +0100)]
lcl: return an appropriate error code

4 years agompegts: check get16() return value
Vittorio Giovara [Wed, 17 Dec 2014 13:53:41 +0000 (14:53 +0100)]
mpegts: check get16() return value

And break flow of execution rather than exiting the function.

CC: libav-stable@libav.org
Bug-Id: CID 732186

4 years agooggdec: add support for VP8 demuxing
James Almer [Fri, 12 Dec 2014 20:57:43 +0000 (20:57 +0000)]
oggdec: add support for VP8 demuxing

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agocmdutils: check file access functions return values
Vittorio Giovara [Tue, 16 Dec 2014 09:43:48 +0000 (10:43 +0100)]
cmdutils: check file access functions return values

CC: libav-stable@libav.org
Bug-Id: CID 703706

4 years agoa64multi: check elbg return values
Vittorio Giovara [Tue, 16 Dec 2014 09:33:38 +0000 (10:33 +0100)]
a64multi: check elbg return values

4 years agoroqvideo: check memory allocations and propagate errors
Vittorio Giovara [Tue, 16 Dec 2014 09:33:37 +0000 (10:33 +0100)]
roqvideo: check memory allocations and propagate errors

4 years agoelbg: check memory allocations and propagate errors
Vittorio Giovara [Tue, 16 Dec 2014 09:33:36 +0000 (10:33 +0100)]
elbg: check memory allocations and propagate errors

4 years agolavu: Refactor side data wiping
Luca Barbato [Mon, 15 Dec 2014 19:38:00 +0000 (20:38 +0100)]
lavu: Refactor side data wiping

And make sure the nb_side_data field is reset as well.

Based on an initial patch from wm4 <nfxjfg@googlemail.com>.

CC: libav-stable@libav.org
4 years agofate: add test for offset theora
Vittorio Giovara [Fri, 12 Dec 2014 03:35:46 +0000 (03:35 +0000)]
fate: add test for offset theora

4 years agotheora: support different visible and coded frame size
Vittorio Giovara [Fri, 12 Dec 2014 20:27:46 +0000 (20:27 +0000)]
theora: support different visible and coded frame size

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agofate: add a DPX parser test
Vittorio Giovara [Mon, 1 Dec 2014 15:20:10 +0000 (16:20 +0100)]
fate: add a DPX parser test

4 years agoDPX parser
Paul B Mahol [Mon, 1 Dec 2014 15:20:09 +0000 (16:20 +0100)]
DPX parser

Additional improvements and fixes by Michael Niedermayer <michaelni@gmx.at>.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>