ffmpeg.git
6 years agoavformat/rmdec: fix return code of ff_rm_parse_packet()
Michael Niedermayer [Thu, 24 Oct 2013 14:53:50 +0000 (16:53 +0200)]
avformat/rmdec: fix return code of ff_rm_parse_packet()

Broken by aecb9d3
Fixes assertion failure
Fixes Ticket3042

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86/videodsp: Properly mark sse2 instructions in emulated_edge_mc x86 simd...
Ronald S. Bultje [Thu, 24 Oct 2013 10:54:32 +0000 (06:54 -0400)]
avcodec/x86/videodsp: Properly mark sse2 instructions in emulated_edge_mc x86 simd as such.

Should fix crashes or corrupt output on pre-SSE2 CPUs when they were
using SSE2-code (e.g. AMD Athlon XP 2400+ or Intel Pentium III) in
hfix or hvar single-edge (left/right) extension functions.

Tested-by: Ingo Brückl <ib@wupperonline.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/utils: Check size argument in ff_add_index_entry()
Michael Niedermayer [Thu, 24 Oct 2013 00:29:50 +0000 (02:29 +0200)]
avformat/utils: Check size argument in ff_add_index_entry()

Fixes infinite loop
Fixes Ticket3061

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Thu, 24 Oct 2013 10:18:14 +0000 (12:18 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavd/x11grab: Support AV_PIX_FMT_PAL8.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/x86/vf_gradfun_init: fix const and related warnings
Michael Niedermayer [Thu, 24 Oct 2013 10:12:04 +0000 (12:12 +0200)]
avfilter/x86/vf_gradfun_init: fix const and related warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/x11grab: Support AV_PIX_FMT_PAL8.
Carl Eugen Hoyos [Thu, 24 Oct 2013 09:10:49 +0000 (11:10 +0200)]
lavd/x11grab: Support AV_PIX_FMT_PAL8.

Fixes ticket #3068.

6 years agofft-test: Remove possibility of returning restricted exit code
Derek Buitenhuis [Tue, 22 Oct 2013 18:19:02 +0000 (19:19 +0100)]
fft-test: Remove possibility of returning restricted exit code

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agodct-test: Remove possibility of returning a restricted exit code
Derek Buitenhuis [Tue, 22 Oct 2013 18:18:36 +0000 (19:18 +0100)]
dct-test: Remove possibility of returning a restricted exit code

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agobase64-test: Remove posibility of returning restrcted exit codes
Derek Buitenhuis [Tue, 22 Oct 2013 18:11:31 +0000 (19:11 +0100)]
base64-test: Remove posibility of returning restrcted exit codes

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agotree-test: Don't return restricted exit codes
Derek Buitenhuis [Tue, 22 Oct 2013 18:08:43 +0000 (19:08 +0100)]
tree-test: Don't return restricted exit codes

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agobuild: remove pointless condition
Ingo Brückl [Thu, 24 Oct 2013 00:18:19 +0000 (02:18 +0200)]
build: remove pointless condition

$(STRIP) always expands to something, because it is one of the commands
in the BRIEF list. This renders the condition pointless.

Signed-off-by: Ingo Brückl <ib@wupperonline.de>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolavc/libmp3lame: add comments about CBR/VBR modes
Timothy Gu [Thu, 24 Oct 2013 03:57:36 +0000 (20:57 -0700)]
lavc/libmp3lame: add comments about CBR/VBR modes

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolavc/libmp3lame: fix alignment and capitalization in AVOptions
Timothy Gu [Thu, 24 Oct 2013 03:55:29 +0000 (20:55 -0700)]
lavc/libmp3lame: fix alignment and capitalization in AVOptions

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agodoc/codecs: update skip_alpha documentation
Timothy Gu [Sat, 19 Oct 2013 00:56:14 +0000 (17:56 -0700)]
doc/codecs: update skip_alpha documentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agodoc/encoders: add libvorbis doc
Timothy Gu [Thu, 17 Oct 2013 03:33:48 +0000 (20:33 -0700)]
doc/encoders: add libvorbis doc

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 24 Oct 2013 08:44:42 +0000 (10:44 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  golomb: reduce scope of a few variables

Conflicts:
libavcodec/golomb.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0e730494160d973400aed8d2addd1f58a0ec883e'
Michael Niedermayer [Thu, 24 Oct 2013 08:32:17 +0000 (10:32 +0200)]
Merge commit '0e730494160d973400aed8d2addd1f58a0ec883e'

* commit '0e730494160d973400aed8d2addd1f58a0ec883e':
  avfilter: x86: Port gradfun filter optimizations to yasm

Conflicts:
libavfilter/x86/vf_gradfun_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavdevice/fbdev_enc: avoid declaring variables in for()
Michael Niedermayer [Thu, 24 Oct 2013 08:18:17 +0000 (10:18 +0200)]
avdevice/fbdev_enc: avoid declaring variables in for()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/libmpcodecs/vf_eq: remove useless storage class specifier in empty declaration
Paul B Mahol [Thu, 24 Oct 2013 07:44:23 +0000 (07:44 +0000)]
avfilter/libmpcodecs/vf_eq: remove useless storage class specifier in empty declaration

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavd/fbdev: move common code to separate file
Lukasz Marek [Sat, 19 Oct 2013 19:12:51 +0000 (21:12 +0200)]
lavd/fbdev: move common code to separate file

Move common fbdev dec/enc for separate file.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolavd: rename fbdev.c into fbdev_dec.c
Lukasz Marek [Sat, 19 Oct 2013 19:38:38 +0000 (21:38 +0200)]
lavd: rename fbdev.c into fbdev_dec.c

Rename existing fbdev.c to make it a more meaningful name.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolavd: add fbdev output device
Lukasz Marek [Wed, 16 Oct 2013 15:18:55 +0000 (17:18 +0200)]
lavd: add fbdev output device

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolsws: use av_pix_fmt_get_chroma_sub_sample()
Stefano Sabatini [Mon, 21 Oct 2013 13:57:07 +0000 (15:57 +0200)]
lsws: use av_pix_fmt_get_chroma_sub_sample()

Remove duplicated getSubSampleFactors() function. Simplify.

6 years agogolomb: reduce scope of a few variables
Vittorio Giovara [Wed, 23 Oct 2013 13:43:19 +0000 (15:43 +0200)]
golomb: reduce scope of a few variables

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoavcodec/mpegaudio_tablegen: fix build with hardcoded tables
Michael Niedermayer [Wed, 23 Oct 2013 23:18:37 +0000 (01:18 +0200)]
avcodec/mpegaudio_tablegen: fix build with hardcoded tables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/metasound_data: Fix inconsistency in tables
Michael Niedermayer [Tue, 22 Oct 2013 15:29:40 +0000 (17:29 +0200)]
avcodec/metasound_data: Fix inconsistency in tables

Fixes out of array read

This issue can be reproduced with:
Lucky.asf
teuflisch.asf
from http://samples.ffmpeg.org/A-codecs/VoxWare/

as well as other samples

fcb16m has 320 elements but the code before the patch can address a
table of 384 elements in its place.
I dont know if theres some elements missing, or its maybe the wrong
table, or if the parameters affecting the table size are wrong, or
if theres something else wrong.
if someone reading this has easy access to some reference. (binary
with the tables in it, spec, whatever, please contact us)

This solution fixes the inconsistency by padding the table with zeros,
this variant was suggested by Vitor Sessak. And ensures that nothing
currently working breaks.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc: remove CODEC_CAP_EXPERIMENTAL
Michael Niedermayer [Wed, 23 Oct 2013 17:52:18 +0000 (19:52 +0200)]
avcodec/hevc: remove CODEC_CAP_EXPERIMENTAL

Approved-by: mraulet
Approved-by: smarter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 23 Oct 2013 17:45:07 +0000 (19:45 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  golomb: K&R formatting cosmetics

Conflicts:
libavcodec/golomb.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7'
Michael Niedermayer [Wed, 23 Oct 2013 17:26:59 +0000 (19:26 +0200)]
Merge commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7'

* commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7':
  h263: K&R formatting cosmetics

Conflicts:
libavcodec/h263dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: fix fieldorder test
Paul B Mahol [Wed, 23 Oct 2013 17:35:37 +0000 (17:35 +0000)]
fate: fix fieldorder test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
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 agoavfilter: x86: Port gradfun filter optimizations to yasm
Daniel Kang [Tue, 22 Oct 2013 00:37:46 +0000 (20:37 -0400)]
avfilter: x86: Port gradfun filter optimizations to yasm

Signed-off-by: Diego Biurrun <diego@biurrun.de>
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 agogolomb: K&R formatting cosmetics
Vittorio Giovara [Tue, 22 Oct 2013 11:12:49 +0000 (13:12 +0200)]
golomb: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoh263: K&R formatting cosmetics
Luca Barbato [Tue, 22 Oct 2013 17:37:44 +0000 (19:37 +0200)]
h263: K&R formatting cosmetics

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
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>