ffmpeg.git
6 years agonut: Fix unchecked allocations
Derek Buitenhuis [Tue, 22 Oct 2013 15:11:11 +0000 (16:11 +0100)]
nut: Fix unchecked allocations

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolavfi/pthread: Avoid crashes/odd behavior caused by spurious wakeups
Derek Buitenhuis [Fri, 18 Oct 2013 14:28:51 +0000 (15:28 +0100)]
lavfi/pthread: Avoid crashes/odd behavior caused by spurious wakeups

This is similar to 5152196b2b47d446d9a509b9bfb318daa26a1f2b.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agolibavcodec/mpegaudio_tablegen: clip value before casting
Michael Niedermayer [Tue, 22 Oct 2013 10:48:47 +0000 (12:48 +0200)]
libavcodec/mpegaudio_tablegen: clip value before casting

Avoids FPE on alpha

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohevc: fix transform_skip which is only valid for 4x4(cherry picked from commit 740e5a...
Mickaël Raulet [Mon, 21 Oct 2013 10:44:18 +0000 (12:44 +0200)]
hevc: fix transform_skip which is only valid for 4x4(cherry picked from commit 740e5a71e5121dbf3fabdc4fec97829c18ecc2d8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohevc: pretty print(cherry picked from commit 6332b3afe298b9e1060e8549aea3aa2771b43f5d)
Mickaël Raulet [Sun, 20 Oct 2013 19:19:15 +0000 (21:19 +0200)]
hevc: pretty print(cherry picked from commit 6332b3afe298b9e1060e8549aea3aa2771b43f5d)

Conflicts:

libavcodec/hevc.h
libavcodec/hevc_filter.c
libavcodec/hevc_refs.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohevc: cleaning disable field in deblocking filter(cherry picked from commit 7dd7a27ae...
Mickaël Raulet [Sun, 20 Oct 2013 07:30:27 +0000 (09:30 +0200)]
hevc: cleaning disable field in deblocking filter(cherry picked from commit 7dd7a27ae850a51b3c9cd07046c422677398f6d5)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohevc: remove disable_au option(cherry picked from commit e90b3f6753d645fec076e951a059...
Mickaël Raulet [Sun, 20 Oct 2013 07:25:59 +0000 (09:25 +0200)]
hevc: remove disable_au option(cherry picked from commit e90b3f6753d645fec076e951a0597a5dc2d2fe31)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Mon, 21 Oct 2013 21:50:04 +0000 (23:50 +0200)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavf/tee: fix leak of bsfs array.
  lavf/tee: fix leak of select option.
  lavf/tee: fix leak of strdup/strtoked buffer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh263dec: use init_get_bits8() and check its return code
Michael Niedermayer [Mon, 21 Oct 2013 21:32:56 +0000 (23:32 +0200)]
h263dec: use init_get_bits8() and check its return code

Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/bintext: protect against potential overflow of chars_per_frame
Michael Niedermayer [Mon, 21 Oct 2013 21:19:04 +0000 (23:19 +0200)]
avformat/bintext: protect against potential overflow of chars_per_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter: replaygain scanner
Paul B Mahol [Thu, 26 Sep 2013 09:41:53 +0000 (09:41 +0000)]
avfilter: replaygain scanner

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 21 Oct 2013 18:09:44 +0000 (20:09 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avio: Use AVERROR_PROTOCOL_NOT_FOUND

Conflicts:
libavformat/avio.c

See: 12eeced8b41bbe46693f8c9625ed61b51f8438a1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '5152196b2b47d446d9a509b9bfb318daa26a1f2b'
Michael Niedermayer [Mon, 21 Oct 2013 17:49:12 +0000 (19:49 +0200)]
Merge commit '5152196b2b47d446d9a509b9bfb318daa26a1f2b'

* commit '5152196b2b47d446d9a509b9bfb318daa26a1f2b':
  pthread: Avoid spurious wakeups

See: e3329474a366de066b25e86f35f5abf9c5a4b7b2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '23e6d3d4e27c83e06d00aa072c84d057bd1dad23'
Michael Niedermayer [Mon, 21 Oct 2013 17:21:10 +0000 (19:21 +0200)]
Merge commit '23e6d3d4e27c83e06d00aa072c84d057bd1dad23'

* commit '23e6d3d4e27c83e06d00aa072c84d057bd1dad23':
  fate: vpx: Remove one redundant $(eval) invocation

Merge for meta data only as this breaks the affected fate tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/tee: fix leak of bsfs array.
Nicolas George [Mon, 21 Oct 2013 15:02:17 +0000 (17:02 +0200)]
lavf/tee: fix leak of bsfs array.

7 years agolavf/tee: fix leak of select option.
Nicolas George [Mon, 21 Oct 2013 15:00:56 +0000 (17:00 +0200)]
lavf/tee: fix leak of select option.

7 years agolavf/tee: fix leak of strdup/strtoked buffer.
Nicolas George [Mon, 21 Oct 2013 14:53:32 +0000 (16:53 +0200)]
lavf/tee: fix leak of strdup/strtoked buffer.

Fix CID 1108606.

7 years agoavfilter/ff_insert_pad: fix order of operations
Michael Niedermayer [Mon, 21 Oct 2013 14:21:14 +0000 (16:21 +0200)]
avfilter/ff_insert_pad: fix order of operations

Fixes out of bounds access
Fixes CID732170
Fixes CID732169

No filter is known to use this function in a way so the issue can be reproduced.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomake it possible to compile ffmpeg without swscale
Paul B Mahol [Tue, 8 Oct 2013 14:48:52 +0000 (14:48 +0000)]
make it possible to compile ffmpeg without swscale

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavio: Use AVERROR_PROTOCOL_NOT_FOUND
Luca Barbato [Sun, 20 Oct 2013 20:01:54 +0000 (22:01 +0200)]
avio: Use AVERROR_PROTOCOL_NOT_FOUND

When the protocol is missing ffurl_alloc() should return
AVERROR_PROTOCOL_NOT_FOUND instead of AVERROR(ENOENT).

Bug-Id: 577
CC: libav-stable@libav.org
7 years agoavformat/mxfdec; parse random index pack to get last partition offset and use it...
Paul B Mahol [Fri, 18 Oct 2013 10:44:56 +0000 (10:44 +0000)]
avformat/mxfdec; parse random index pack to get last partition offset and use it when footer partition offset is missing

Footer partition may not be present and even if present footer partition
offset may not be set in any partition except last one.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agopthread: Avoid spurious wakeups
Ben Jackson [Fri, 18 Oct 2013 14:28:50 +0000 (15:28 +0100)]
pthread: Avoid spurious wakeups

pthread_wait_cond can wake up unexpectedly (Wikipedia: Spurious_wakeup).

The FF_THREAD_SLICE thread mechanism could spontaneously execute
jobs or allow the caller of avctx->execute to return before all
jobs were complete.

Test both cases to ensure the wakeup is real.

Signed-off-by: Ben Jackson <ben@ben.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agofate: enable hevc tests
Michael Niedermayer [Mon, 21 Oct 2013 11:52:47 +0000 (13:52 +0200)]
fate: enable hevc tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoSupport FF_DISABLE_DEPRECATION_WARNINGS with icc on Linux.
Carl Eugen Hoyos [Mon, 21 Oct 2013 11:49:30 +0000 (13:49 +0200)]
Support FF_DISABLE_DEPRECATION_WARNINGS with icc on Linux.

7 years agoffprobe: fix consistency checks in parse_read_intervals()
Stefano Sabatini [Mon, 21 Oct 2013 11:33:06 +0000 (13:33 +0200)]
ffprobe: fix consistency checks in parse_read_intervals()

Move array size assert after the count increment, and avoid strchr() NULL
dereference on p.

Should fix FFmpeg coverity issue #1108581.

7 years agoavcodec/hevc: fix duplicate/wrong nal unit check and difference to openhevc_upstream
Mickaël Raulet [Sun, 20 Oct 2013 20:40:39 +0000 (22:40 +0200)]
avcodec/hevc: fix duplicate/wrong nal unit check and difference to openhevc_upstream

NAL_BLA_W_RADL instead of NAL_BLA_N_LP

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: add synthetic swresample resampling tests
Michael Niedermayer [Thu, 17 Oct 2013 22:21:36 +0000 (00:21 +0200)]
fate: add synthetic swresample resampling tests

this is based on libavresample.mak

These tests do not depend on external samples

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/vobsub: fix invalid sub queue access while seeking.
Clément Bœsch [Sun, 20 Oct 2013 19:23:43 +0000 (21:23 +0200)]
avformat/vobsub: fix invalid sub queue access while seeking.

If there is only 1 stream and seek isn't called with a specific stream
index, we pick the first (and only) one.

Regression since dbfe6110.

Fixes CID1108591.

7 years agoavcodec/vp9dsp: fix overwrite by 1 in vert_left pred.
Ronald S. Bultje [Sun, 20 Oct 2013 19:05:28 +0000 (21:05 +0200)]
avcodec/vp9dsp: fix overwrite by 1 in vert_left pred.

The memset following the memcpy was silencing the problem since
re-writing that same byte.

Fixes CID1108597, CID1108598, (16x16)
      CID1108599, CID1108600, (8x8)
      CID1108601, CID1108602  (32x32)

Signed-off-by: Clément Bœsch <u@pkh.me>
7 years agolavc: make avcodec_decode_subtitle2 more robust
Marton Balint [Sun, 20 Oct 2013 16:24:55 +0000 (18:24 +0200)]
lavc: make avcodec_decode_subtitle2 more robust

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMAINTAINERS: add lavd/fbdev_enc entry
Lukasz Marek [Sat, 19 Oct 2013 19:38:40 +0000 (21:38 +0200)]
MAINTAINERS: add lavd/fbdev_enc entry

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agolavd/pulse_audio_enc: add support for flushing
Lukasz Marek [Fri, 18 Oct 2013 21:41:20 +0000 (23:41 +0200)]
lavd/pulse_audio_enc: add support for flushing

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agoavutil/opt: initialize ret
Michael Niedermayer [Sun, 20 Oct 2013 16:38:48 +0000 (18:38 +0200)]
avutil/opt: initialize ret

Fixes CID1108610
Fixes use of uninitialized variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/file_open: Print debug message if setting close on exec fails
Michael Niedermayer [Sun, 20 Oct 2013 16:36:09 +0000 (18:36 +0200)]
avutil/file_open: Print debug message if setting close on exec fails

Fixes CID1087079
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/utils: Check av_packet_new_side_data() return before using it
Michael Niedermayer [Sun, 20 Oct 2013 16:33:53 +0000 (18:33 +0200)]
avformat/utils: Check av_packet_new_side_data() return before using it

Fixes null pointer dereference
Fixes CID1108592
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/oggparsespeex: Check for extradata allocation failure
Michael Niedermayer [Sun, 20 Oct 2013 14:57:45 +0000 (16:57 +0200)]
avformat/oggparsespeex: Check for extradata allocation failure

Fixes CID1108574
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/oggparseflac: check ff_alloc_extradata() return code
Michael Niedermayer [Sun, 20 Oct 2013 14:55:43 +0000 (16:55 +0200)]
avformat/oggparseflac: check ff_alloc_extradata() return code

Fixes CID1108573
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/oggparsecelt/celt_header: fix memleak
Michael Niedermayer [Sun, 20 Oct 2013 14:38:20 +0000 (16:38 +0200)]
avformat/oggparsecelt/celt_header: fix memleak

Fixes: CID1108605
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/network: check for fcntl() failure in ff_socket()
Michael Niedermayer [Sun, 20 Oct 2013 14:34:32 +0000 (16:34 +0200)]
avformat/network: check for fcntl() failure in ff_socket()

Fixes: CID1087075
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/au: add assert to help source code analyzers
Michael Niedermayer [Sun, 20 Oct 2013 12:33:05 +0000 (14:33 +0200)]
avformat/au: add assert to help source code analyzers

See: CID1108585 and CID1108603
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/vp9: Add asserts to help source code analyzers
Michael Niedermayer [Sun, 20 Oct 2013 12:09:55 +0000 (14:09 +0200)]
avcodec/vp9: Add asserts to help source code analyzers

See CID1108596 and CID1108595
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohevc: Initialize sample aspect to valid value.
Reimar Döffinger [Thu, 17 Oct 2013 19:01:44 +0000 (21:01 +0200)]
hevc: Initialize sample aspect to valid value.

Without this, it is 0/0 by default, which is not allowed.
This sets it to 0/1, which means "undefined".

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agohevc: pretty print(cherry picked from commit 64a4b623b7d66dfc0f3883e5f1d9125c00c3b18c)
Mickaël Raulet [Sat, 19 Oct 2013 15:04:44 +0000 (17:04 +0200)]
hevc: pretty print(cherry picked from commit 64a4b623b7d66dfc0f3883e5f1d9125c00c3b18c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohevc: fix PPS_A_qualcomm_7(cherry picked from commit 2af177a8761c88eb477a658eebcf4264...
Mickaël Raulet [Sat, 19 Oct 2013 15:03:59 +0000 (17:03 +0200)]
hevc: fix PPS_A_qualcomm_7(cherry picked from commit 2af177a8761c88eb477a658eebcf4264068aa773)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/wavpackenc: fix uninitialized ret
Michael Niedermayer [Sat, 19 Oct 2013 23:58:51 +0000 (01:58 +0200)]
avcodec/wavpackenc: fix uninitialized ret

Fixes CID1108609

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/tiff: remove byte based bpp special case
Michael Niedermayer [Sat, 19 Oct 2013 23:50:34 +0000 (01:50 +0200)]
avcodec/tiff: remove byte based bpp special case

This case does not work as off is uninitialized and it should be
handled fine by the generic code below

Fixes CID1108608

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/hevc_refs: fix h/vshift calculation in ff_hevc_output_frame()
Michael Niedermayer [Sat, 19 Oct 2013 22:41:00 +0000 (00:41 +0200)]
avcodec/hevc_refs: fix h/vshift calculation in ff_hevc_output_frame()

Fixes CID1108577

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/hevc: do not dereference pointer before null check in verify_md5()
Michael Niedermayer [Sat, 19 Oct 2013 22:35:18 +0000 (00:35 +0200)]
avcodec/hevc: do not dereference pointer before null check in verify_md5()

Fixes: CID1108607

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/hevc_cabac: trivial simplifications
Michael Niedermayer [Sat, 19 Oct 2013 22:33:29 +0000 (00:33 +0200)]
avcodec/hevc_cabac: trivial simplifications

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohevc: inline cabac in hls_mvd_coding(cherry picked from commit ad387195ad04e8a005a1bf...
Mickaël Raulet [Fri, 18 Oct 2013 18:01:29 +0000 (20:01 +0200)]
hevc: inline cabac in hls_mvd_coding(cherry picked from commit ad387195ad04e8a005a1bfd509e9e4f827e68fa9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohevc: inline cabac in residual coding(cherry picked from commit 17d7a880445b72feb36d6...
Mickaël Raulet [Fri, 18 Oct 2013 14:16:48 +0000 (16:16 +0200)]
hevc: inline cabac in residual coding(cherry picked from commit 17d7a880445b72feb36d684ae1f0597195811e97)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/hevc: fix EOB/EOS check
Michael Niedermayer [Sat, 19 Oct 2013 22:23:48 +0000 (00:23 +0200)]
avcodec/hevc: fix EOB/EOS check

Fixes: CID1108575
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/h264_parser: fix order of operations
Michael Niedermayer [Sat, 19 Oct 2013 21:44:34 +0000 (23:44 +0200)]
avcodec/h264_parser: fix order of operations

Fixes CID1108576

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1enc: use 64bit in maxsize calculation
Michael Niedermayer [Sat, 19 Oct 2013 21:36:35 +0000 (23:36 +0200)]
ffv1enc: use 64bit in maxsize calculation

This isnt needed but it cant hurt, its also more consistent with
how its calculated a few lines before.

See: CID1108593
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/exr: fix null pointer dereference
Michael Niedermayer [Sat, 19 Oct 2013 21:28:08 +0000 (23:28 +0200)]
avcodec/exr: fix null pointer dereference

Fixes CID1108582

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/exr: favor av_freep() over av_free() for saftey
Michael Niedermayer [Sat, 19 Oct 2013 21:27:36 +0000 (23:27 +0200)]
avcodec/exr: favor av_freep() over av_free() for saftey

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/oggdec: favor av_freep() over av_free()
Michael Niedermayer [Sat, 19 Oct 2013 20:50:16 +0000 (22:50 +0200)]
avformat/oggdec: favor av_freep() over av_free()

Found-by: Reimar Döffinger
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/utils: add some saftey checks to add_metadata_from_side_data()
Michael Niedermayer [Sat, 19 Oct 2013 15:52:47 +0000 (17:52 +0200)]
avcodec/utils: add some saftey checks to add_metadata_from_side_data()

This fixes potential overreads with crafted files.

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/avpacket/av_packet_split_side_data: ensure that side data padding is initialized
Michael Niedermayer [Sat, 19 Oct 2013 15:45:54 +0000 (17:45 +0200)]
avcodec/avpacket/av_packet_split_side_data: ensure that side data padding is initialized

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoDo not leave positive values undefined when negative are defined as error
Michael Niedermayer [Sun, 15 Sep 2013 13:25:09 +0000 (15:25 +0200)]
Do not leave positive values undefined when negative are defined as error

Define positive return values as non errors and leave further meaning undefined
This allows future extensions to use these values

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/developer: Add a policy item about updating the MAINTAINERs file
Michael Niedermayer [Fri, 11 Oct 2013 21:02:46 +0000 (23:02 +0200)]
doc/developer: Add a policy item about updating the MAINTAINERs file

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: vpx: Remove one redundant $(eval) invocation
Diego Biurrun [Wed, 16 Oct 2013 14:42:24 +0000 (16:42 +0200)]
fate: vpx: Remove one redundant $(eval) invocation

7 years agoavformat/wtvdec: drop SHIFT_SECTOR_BITS() macro
Michael Niedermayer [Sat, 19 Oct 2013 09:15:07 +0000 (11:15 +0200)]
avformat/wtvdec: drop SHIFT_SECTOR_BITS() macro

it just wraps around a bitwise shift, and makes the code harder to read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 19 Oct 2013 09:01:59 +0000 (11:01 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wtv: Seek by sector properly

Conflicts:
libavformat/wtvdec.c

See: a0d13d84a928110b0e99ea16d17fd758fcbde35f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/wtv: rename to wtv_common
Michael Niedermayer [Sat, 19 Oct 2013 08:58:17 +0000 (10:58 +0200)]
avformat/wtv: rename to wtv_common

This helps git matchup files on merges correctly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMAINTAINERS: add Timothy to documentation
Michael Niedermayer [Fri, 18 Oct 2013 22:49:54 +0000 (00:49 +0200)]
MAINTAINERS: add Timothy to documentation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: remove \r from cc_ident,
俞晓磊 [Fri, 18 Oct 2013 22:07:31 +0000 (00:07 +0200)]
configure: remove \r from cc_ident,

This should fix cygwin + non-cygwin toolchain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavd/pulse_audio_enc: fix error check
Lukasz Marek [Fri, 18 Oct 2013 21:41:19 +0000 (23:41 +0200)]
lavd/pulse_audio_enc: fix error check

Error check should be done by checking negative value, not non-zero.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agolavd/fbdev: use av_str2err() macro for printing error messages
Stefano Sabatini [Fri, 18 Oct 2013 21:38:54 +0000 (23:38 +0200)]
lavd/fbdev: use av_str2err() macro for printing error messages

In particular fix wrong strerror(ret) with a negative value, and avoid
the use of non thread-safe strerror().

7 years agolavd/pulse_audio_dec: apply cosmetic changes
Lukasz Marek [Fri, 18 Oct 2013 20:12:15 +0000 (22:12 +0200)]
lavd/pulse_audio_dec: apply cosmetic changes

In particular, fix punctuation in docs and make option help messages
grammatically consistent.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agolavd/fbdev: pass proper memory map length
Lukasz Marek [Fri, 18 Oct 2013 18:45:13 +0000 (20:45 +0200)]
lavd/fbdev: pass proper memory map length

fbdev->data was allocated with size fbdev->fixinfo.smem_len, release data
in fbdev_read_close() using the same size.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agoMAINTAINERS: add my name to a few entries
Stefano Sabatini [Fri, 18 Oct 2013 11:06:17 +0000 (13:06 +0200)]
MAINTAINERS: add my name to a few entries

7 years agoFix decoding of G.726 in AIFF.
Carl Eugen Hoyos [Fri, 18 Oct 2013 17:53:47 +0000 (19:53 +0200)]
Fix decoding of G.726 in AIFF.

Fixes ticket #1973.

7 years agolavf/riff: Fix a comment.
Carl Eugen Hoyos [Fri, 18 Oct 2013 17:35:03 +0000 (19:35 +0200)]
lavf/riff: Fix a comment.

FourCC aivx refers to (Sony) XAVC, not (Panasonic) AVC-Intra.
Spotted by Kieran Kunhya and Vincent Olivier.

7 years agoavformat: Use G726LE decoder for Sun AU files
Carl Eugen Hoyos [Thu, 11 Jul 2013 12:06:20 +0000 (14:06 +0200)]
avformat: Use G726LE decoder for Sun AU files

fixes ticket #1955 as suggested by Roman.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec: Add little-endian G726 decoder
Carl Eugen Hoyos [Thu, 11 Jul 2013 12:06:20 +0000 (14:06 +0200)]
avcodec: Add little-endian G726 decoder

Fixes part of Ticket1955
suggested by Roman.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoSupport 4k AVC-Intra in mov.
Carl Eugen Hoyos [Fri, 18 Oct 2013 05:50:50 +0000 (07:50 +0200)]
Support 4k AVC-Intra in mov.

7 years agowtv: Seek by sector properly
Luca Barbato [Fri, 18 Oct 2013 11:45:13 +0000 (13:45 +0200)]
wtv: Seek by sector properly

Use an helper function to seek by sector to avoid possible mistakes
due shifting by WTV_SECTOR_BITS a 32bit integer.

Contrary to common intuition, a 32 bit integer left shifted
by a 64 bit integer does not promote the 32 bit integer to
64 bit before shifting.

7 years agoavformat/flvdec: use avpriv_request_sample()
Paul B Mahol [Fri, 18 Oct 2013 09:55:16 +0000 (09:55 +0000)]
avformat/flvdec: use avpriv_request_sample()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavcodec/hevcpred: fix make checkheaders.
Clément Bœsch [Thu, 17 Oct 2013 19:25:14 +0000 (21:25 +0200)]
avcodec/hevcpred: fix make checkheaders.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 17 Oct 2013 18:15:18 +0000 (20:15 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: Increase the tolerance in the lavr tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92'
Michael Niedermayer [Thu, 17 Oct 2013 17:50:19 +0000 (19:50 +0200)]
Merge commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92'

* commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92':
  fate: aac: Add test for AAC-LD

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolswr/swresample: convert ocl and icl options to AV_OPT_TYPE_CHANNEL_LAYOUT
Stefano Sabatini [Mon, 14 Oct 2013 23:20:35 +0000 (01:20 +0200)]
lswr/swresample: convert ocl and icl options to AV_OPT_TYPE_CHANNEL_LAYOUT

Improve interface flexibility. In particular makes it possible to set
channel layout through symbolic names using the av_opt_set() interface.

7 years agofate: Increase the tolerance in the lavr tests
Martin Storsjö [Thu, 17 Oct 2013 08:38:58 +0000 (11:38 +0300)]
fate: Increase the tolerance in the lavr tests

A few fate instances on OS/2, OpenBSD, FreeBSD and IA64 linux currently
still fail a few tests with a maxdiff of 6.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolavu/opt: add AV_OPT_TYPE_CHANNEL_LAYOUT and handler functions
Stefano Sabatini [Fri, 4 Oct 2013 10:07:55 +0000 (12:07 +0200)]
lavu/opt: add AV_OPT_TYPE_CHANNEL_LAYOUT and handler functions

The new type is compatible with AV_OPT_TYPE_INT64, but allows to specify
channel layouts using the format accepted by av_get_channel_layout().

7 years agolavu/channel_layout: change av_get_channel_layout() behavior at the next bump
Stefano Sabatini [Fri, 4 Oct 2013 13:20:50 +0000 (15:20 +0200)]
lavu/channel_layout: change av_get_channel_layout() behavior at the next bump

The new syntax is preferred since it allows backward syntax compatibility
with libswr when switching to the new option handling code with
AV_OPT_TYPE_CHANNEL_LAYOUT.

With the new parser the string:
1234

is interpreted as a channel layout mask, rather than as a number of
channels, and thus it's compatible with the current way to set a channel
layout as an integer (e.g. for the icl and ocl options) making use of
integer option values.

ff_get_channel_layout() with compat=0 will be used in the
AV_OPT_TYPE_CHANNEL handler code.

The user is encouraged to switch to the new forward compatible syntax,
which requires to put a trailing "c" when specifying a layout as a number
of channels.

7 years agolavu/opt.h: fix grammar typo in av_opt_get* doxy
Stefano Sabatini [Thu, 17 Oct 2013 15:08:11 +0000 (17:08 +0200)]
lavu/opt.h: fix grammar typo in av_opt_get* doxy

7 years agolavu/opt-test: use automatic set and free handlers
Stefano Sabatini [Thu, 17 Oct 2013 14:52:02 +0000 (16:52 +0200)]
lavu/opt-test: use automatic set and free handlers

In particular, do not set default string value by hand and use
av_opt_free() to free context.

7 years agoswscale/yuv2rgb: clip cy, avoid division by 0 with 0 contrast
Michael Niedermayer [Thu, 17 Oct 2013 11:39:28 +0000 (13:39 +0200)]
swscale/yuv2rgb: clip cy, avoid division by 0 with 0 contrast

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale/utils/sws_setColorspaceDetails(): fix indention
Michael Niedermayer [Thu, 17 Oct 2013 09:18:04 +0000 (11:18 +0200)]
swscale/utils/sws_setColorspaceDetails(): fix indention

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: aac: Add test for AAC-LD
Diego Biurrun [Mon, 14 Oct 2013 21:40:05 +0000 (23:40 +0200)]
fate: aac: Add test for AAC-LD

7 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Thu, 17 Oct 2013 08:42:36 +0000 (10:42 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Add some necessary casts in the wtv demuxer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/hevcdec: add more irap cases to hevc_probe()
Dirk Farin [Thu, 17 Oct 2013 08:14:51 +0000 (10:14 +0200)]
avformat/hevcdec: add more irap cases to hevc_probe()

This fixes fate-hevc-conformance-RAP_A_docomo_4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/hevcdec: cosmetics, whitespaces
Dirk Farin [Sat, 12 Oct 2013 09:55:44 +0000 (11:55 +0200)]
avformat/hevcdec: cosmetics, whitespaces

This reduces the difference to the latest hevc demuxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAdd some necessary casts in the wtv demuxer.
Carl Eugen Hoyos [Thu, 17 Oct 2013 07:51:06 +0000 (09:51 +0200)]
Add some necessary casts in the wtv demuxer.

This reverts e8023dba, fixes ticket #3049.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 17 Oct 2013 06:13:12 +0000 (08:13 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mem: Make av_strdup allocate using av_realloc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohevc: fix pcm with different chroma luma bit widths(cherry picked from commit 6a44451...
Mickaël Raulet [Wed, 16 Oct 2013 14:03:57 +0000 (16:03 +0200)]
hevc: fix pcm with different chroma luma bit widths(cherry picked from commit 6a444516f338424d062c0ef2806714036283603b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohevc: optimize residual coding(cherry picked from commit 70692a44708157b4dfa50e402e44...
Mickaël Raulet [Fri, 11 Oct 2013 20:07:00 +0000 (22:07 +0200)]
hevc: optimize residual coding(cherry picked from commit 70692a44708157b4dfa50e402e446bfa2b27f55e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/log: fix race between setting and using the log callback
Michael Niedermayer [Wed, 16 Oct 2013 22:48:43 +0000 (00:48 +0200)]
avutil/log: fix race between setting and using the log callback

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/utils: fix docs build
Michael Niedermayer [Wed, 16 Oct 2013 20:25:08 +0000 (22:25 +0200)]
doc/utils: fix docs build

Not sure this is the correct solution but that can be investigated too once
the docs build again

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