ffmpeg.git
6 years agoMerge commit '0d6d4a9e4a626be6ff55839eab4114aeac45ba88'
Michael Niedermayer [Wed, 23 Oct 2013 16:52:03 +0000 (18:52 +0200)]
Merge commit '0d6d4a9e4a626be6ff55839eab4114aeac45ba88'

* commit '0d6d4a9e4a626be6ff55839eab4114aeac45ba88':
  avstring-test: Mark pointer passed to av_free() as non-const

See: ab796ded757e616cb9167c0a15d70903b86e00f9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/log: document log callback thread saftey requirements
Michael Niedermayer [Wed, 16 Oct 2013 23:40:19 +0000 (01:40 +0200)]
avutil/log: document log callback thread saftey requirements

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/log: make default av_log callback thread safe
Michael Niedermayer [Wed, 16 Oct 2013 21:23:18 +0000 (23:23 +0200)]
avutil/log: make default av_log callback thread safe

This uses a pthread mutex

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/utils: use a default lock manager that uses a pthread mutex
Michael Niedermayer [Thu, 17 Oct 2013 13:32:03 +0000 (15:32 +0200)]
avcodec/utils: use a default lock manager that uses a pthread mutex

That makes avformat & avcodec thread safe without the need to explicitly
register a lock manager.

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/framehash: add software version to framecrc/md5
Michael Niedermayer [Sun, 20 Oct 2013 20:23:08 +0000 (22:23 +0200)]
avformat/framehash: add software version to framecrc/md5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/adtsenc: Add support for APE tags
James Almer [Thu, 11 Jul 2013 23:40:17 +0000 (20:40 -0300)]
lavf/adtsenc: Add support for APE tags

Should fix ticket #2269

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_scale: Correct vf_scale mappings from arguments to color range
Robert Krüger [Wed, 23 Oct 2013 10:50:07 +0000 (12:50 +0200)]
avfilter/vf_scale: Correct vf_scale mappings from arguments to color range

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vc1dec: use logical operation instead of bitwise for twomv
Michael Niedermayer [Sat, 19 Oct 2013 22:00:36 +0000 (00:00 +0200)]
avcodec/vc1dec: use logical operation instead of bitwise for twomv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofix order of operations in comments
Michael Niedermayer [Sat, 19 Oct 2013 21:49:37 +0000 (23:49 +0200)]
fix order of operations in comments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavstring-test: Mark pointer passed to av_free() as non-const
Diego Biurrun [Sat, 19 Oct 2013 14:12:49 +0000 (16:12 +0200)]
avstring-test: Mark pointer passed to av_free() as non-const

libavutil/avstring.c:278:9: warning: passing argument 1 of ‘av_free’ discards ‘const’ qualifier from pointer target type

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 23 Oct 2013 11:04:30 +0000 (13:04 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: Drop a faulty assert

Conflicts:
libavcodec/mpegvideo.c

Merge for metadata only, the change looks wrong.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d'
Michael Niedermayer [Wed, 23 Oct 2013 10:13:38 +0000 (12:13 +0200)]
Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d'

* commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d':
  avfilter: Fix typo in Loren's email address

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388'
Michael Niedermayer [Wed, 23 Oct 2013 10:02:05 +0000 (12:02 +0200)]
Merge commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388'

* commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388':
  movenc: Add an F4V muxer

Conflicts:
Changelog
libavformat/allformats.c
libavformat/movenc.c
libavformat/version.h

See: 7bc70930ddc487712419e65ebca4d77868a20ffb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: Dont crash on unconnected output pads before an error is printed
Michael Niedermayer [Wed, 23 Oct 2013 09:39:43 +0000 (11:39 +0200)]
ffmpeg: Dont crash on unconnected output pads before an error is printed

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/aacdec: fix more avpriv_report_missing_feature() arguments
Michael Niedermayer [Wed, 23 Oct 2013 08:44:18 +0000 (10:44 +0200)]
avcodec/aacdec: fix more avpriv_report_missing_feature() arguments

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo: Drop a faulty assert
Luca Barbato [Tue, 22 Oct 2013 17:17:10 +0000 (19:17 +0200)]
mpegvideo: Drop a faulty assert

That check is easily reachable by faulty input.

CC:libav-stable@libav.org
Reported-by: Torsten Sadowski <tsadowski@gmx.net>
6 years agoavcodec/aacdec: fix avpriv_report_missing_feature() arguments
Michael Niedermayer [Wed, 23 Oct 2013 08:44:18 +0000 (10:44 +0200)]
avcodec/aacdec: fix avpriv_report_missing_feature() arguments

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter: Fix typo in Loren's email address
Diego Biurrun [Mon, 21 Oct 2013 20:35:02 +0000 (22:35 +0200)]
avfilter: Fix typo in Loren's email address

6 years agomovenc: Add an F4V muxer
Clément Bœsch [Mon, 17 Sep 2012 14:16:16 +0000 (16:16 +0200)]
movenc: Add an F4V muxer

F4V is Adobe's mp4/iso media variant, with the most significant
addition/change being supporting other flash codecs than just
aac/h264.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoswscale/utils: check mprotect() return code
Michael Niedermayer [Wed, 23 Oct 2013 08:14:05 +0000 (10:14 +0200)]
swscale/utils: check mprotect() return code

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 23 Oct 2013 08:02:43 +0000 (10:02 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aac: Add support for Enhanced AAC Low Delay (ER AAC ELD).

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f457edb69794c7e13b3630456d72f7942fff19f7'
Michael Niedermayer [Wed, 23 Oct 2013 07:53:52 +0000 (09:53 +0200)]
Merge commit 'f457edb69794c7e13b3630456d72f7942fff19f7'

* commit 'f457edb69794c7e13b3630456d72f7942fff19f7':
  aacdec: Use avpriv_report_missing_feature() instead of custom logging.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4'
Michael Niedermayer [Wed, 23 Oct 2013 07:47:41 +0000 (09:47 +0200)]
Merge commit 'b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4'

* commit 'b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4':
  nut: Fix unchecked allocations

Conflicts:
libavformat/nut.c
libavformat/nutdec.c
libavformat/nutenc.c

See: 55ae13e3deffa21027a44f31b4ae2f53a4fa7426
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3511d4fc9784d5fbb024dce68ca7a0d7fdd74663'
Michael Niedermayer [Wed, 23 Oct 2013 07:26:57 +0000 (09:26 +0200)]
Merge commit '3511d4fc9784d5fbb024dce68ca7a0d7fdd74663'

* commit '3511d4fc9784d5fbb024dce68ca7a0d7fdd74663':
  pthread: Avoid crashes/odd behavior caused by spurious wakeups

See: 692b93090443519c407834fc61e78b23a9019ac2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaac: Add support for Enhanced AAC Low Delay (ER AAC ELD).
Alex Converse [Mon, 14 Oct 2013 20:51:46 +0000 (13:51 -0700)]
aac: Add support for Enhanced AAC Low Delay (ER AAC ELD).

This does not include support for LD SBR, epTool, data resilience, nor
the 960 transform family.

6 years agoaacdec: Use avpriv_report_missing_feature() instead of custom logging.
Alex Converse [Tue, 22 Oct 2013 10:41:04 +0000 (03:41 -0700)]
aacdec: Use avpriv_report_missing_feature() instead of custom logging.

6 years agoavcodec/sgi: Fix dereferencing uninitialized pointer
Michael Niedermayer [Tue, 22 Oct 2013 23:40:57 +0000 (01:40 +0200)]
avcodec/sgi: Fix dereferencing uninitialized pointer

This also fixes the code so it decodes raw images correctly again
No release is affected by this

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc/extract_rbsp: fix error return type
Michael Niedermayer [Tue, 22 Oct 2013 18:31:49 +0000 (20:31 +0200)]
avcodec/hevc/extract_rbsp: fix error return type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: add wavefront parallel processing
Mickaël Raulet [Mon, 21 Oct 2013 09:49:35 +0000 (11:49 +0200)]
hevc: add wavefront parallel processing

cherry picked from commit b971f2c8fdc60f8bab605a6e8060492eb548a53a
cherry picked from commit e57b0a2c915ce6b8a9d57b8292f6581f0680842e

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/pthread: add wpp api
Mickaël Raulet [Sun, 20 Oct 2013 20:48:03 +0000 (22:48 +0200)]
avcodec/pthread: add wpp api

cherry picked from commit c7765f3295fe7dc0653161c6a3d3e1778b76ee67
cherry picked from commit 0008c4979fc1d1bc24d4d2c791715f6dd017563c

Conflicts:

libavcodec/utils.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 22 Oct 2013 17:32:54 +0000 (19:32 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: add fieldorder filter test

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '00d7369de06a16f7c8770a899fcb16bcb94b1e20'
Michael Niedermayer [Tue, 22 Oct 2013 17:26:39 +0000 (19:26 +0200)]
Merge commit '00d7369de06a16f7c8770a899fcb16bcb94b1e20'

* commit '00d7369de06a16f7c8770a899fcb16bcb94b1e20':
  vf_fieldorder: log when processing is skipped

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '103d073dd7ce23b912df32be8c9524ba25dd5991'
Michael Niedermayer [Tue, 22 Oct 2013 17:17:18 +0000 (19:17 +0200)]
Merge commit '103d073dd7ce23b912df32be8c9524ba25dd5991'

* commit '103d073dd7ce23b912df32be8c9524ba25dd5991':
  h264_parser: Use ff_h264_reset_sei()

Conflicts:
libavcodec/h264_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '19f53840001a7afcdb57b2a797e363ec8081aba3'
Michael Niedermayer [Tue, 22 Oct 2013 17:09:33 +0000 (19:09 +0200)]
Merge commit '19f53840001a7afcdb57b2a797e363ec8081aba3'

* commit '19f53840001a7afcdb57b2a797e363ec8081aba3':
  h264_parser: Fix order of operations

See: 9c0fe487c755c19da48f4cc76aba1ac0931b5863
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f825d42bccdb9f89669a586951de7f66a81e80a5'
Michael Niedermayer [Tue, 22 Oct 2013 17:01:36 +0000 (19:01 +0200)]
Merge commit 'f825d42bccdb9f89669a586951de7f66a81e80a5'

* commit 'f825d42bccdb9f89669a586951de7f66a81e80a5':
  avplay: Accept cpuflags option

Conflicts:
cmdutils_common_opts.h
doc/ffmpeg.texi
doc/fftools-common-opts.texi
ffmpeg_opt.c

See: 1060e9ce5454e7ac009969ab2cf8f7cd83a69ac3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp9: always consume the full input packet
Hendrik Leppkes [Tue, 22 Oct 2013 15:57:56 +0000 (17:57 +0200)]
vp9: always consume the full input packet

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agonut: Fix unchecked allocations
Derek Buitenhuis [Tue, 22 Oct 2013 15:11:11 +0000 (16:11 +0100)]
nut: Fix unchecked allocations

CC: libav-stable@libav.org
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoavcodec/vcr1: print the actual size when its insufficient
Michael Niedermayer [Tue, 22 Oct 2013 13:01:54 +0000 (15:01 +0200)]
avcodec/vcr1: print the actual size when its insufficient

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vcr1: Fix bitstream input size check
Michael Niedermayer [Tue, 22 Oct 2013 12:40:49 +0000 (14:40 +0200)]
avcodec/vcr1: Fix bitstream input size check

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>
6 years agopthread: Avoid crashes/odd behavior caused by spurious wakeups
Derek Buitenhuis [Fri, 18 Oct 2013 14:28:51 +0000 (15:28 +0100)]
pthread: Avoid crashes/odd behavior caused by spurious wakeups

This is similar to 5152196b2b47d446d9a509b9bfb318daa26a1f2b.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 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>
6 years agofate: add fieldorder filter test
Vittorio Giovara [Sun, 13 Oct 2013 10:41:47 +0000 (10:41 +0000)]
fate: add fieldorder filter test

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agovf_fieldorder: log when processing is skipped
Vittorio Giovara [Tue, 22 Oct 2013 07:21:18 +0000 (07:21 +0000)]
vf_fieldorder: log when processing is skipped

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoh264_parser: Use ff_h264_reset_sei()
Yusuke Nakamura [Mon, 14 Oct 2013 19:22:42 +0000 (19:22 +0000)]
h264_parser: Use ff_h264_reset_sei()

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoh264_parser: Fix order of operations
Michael Niedermayer [Sun, 20 Oct 2013 12:11:05 +0000 (12:11 +0000)]
h264_parser: Fix order of operations

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoavplay: Accept cpuflags option
Luca Barbato [Mon, 14 Oct 2013 03:41:45 +0000 (05:41 +0200)]
avplay: Accept cpuflags option

Quite useful for debugging.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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.

6 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.

6 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.

6 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>
6 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>
6 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
6 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>
6 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>
6 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>
6 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.

6 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.

6 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>
6 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>
6 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.

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>