ffmpeg.git
5 years agocmdutils: fix expected signature for show_colors() function n2.2-dev
Stefano Sabatini [Mon, 28 Oct 2013 08:39:38 +0000 (09:39 +0100)]
cmdutils: fix expected signature for show_colors() function

Fix warning:
In file included from ffprobe.c:2557:0:
cmdutils_common_opts.h:17:5: warning: initialization from incompatible pointer type [enabled by default]
cmdutils_common_opts.h:17:5: warning: (near initialization for ‘real_options[16].u.func_arg’) [enabled by default]

Spotted-by: Paul B Mahol
5 years agodoc/RELEASE_NOTES: update for 2.1
Michael Niedermayer [Mon, 28 Oct 2013 00:13:46 +0000 (01:13 +0100)]
doc/RELEASE_NOTES: update for 2.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavdevice/pulse_audio_enc: remove double ;
Michael Niedermayer [Sun, 27 Oct 2013 23:52:11 +0000 (00:52 +0100)]
avdevice/pulse_audio_enc: remove double ;

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/APIchanges: add 2 missing hashes & versions
Michael Niedermayer [Sun, 27 Oct 2013 23:45:19 +0000 (00:45 +0100)]
doc/APIchanges: add 2 missing hashes & versions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINERS: update which releases i maintain
Michael Niedermayer [Sun, 27 Oct 2013 23:40:15 +0000 (00:40 +0100)]
MAINTAINERS: update which releases i maintain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoChangelog: add 2.1
Michael Niedermayer [Sun, 27 Oct 2013 23:39:34 +0000 (00:39 +0100)]
Changelog: add 2.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: add decode hrd
Mickaël Raulet [Sun, 27 Oct 2013 18:33:05 +0000 (19:33 +0100)]
hevc: add decode hrd
(cherry picked from commit ab4061dff796b1dd2bc884101226aab48c2c875e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: better mt implementation
Anton Khirnov [Sun, 27 Oct 2013 15:50:20 +0000 (16:50 +0100)]
hevc: better mt implementation

Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr>
(cherry picked from commit 93afb8c519deca85b3c97804927de5b016dd32d1)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: clean up mvs(cherry picked from commit 955317c09b877a513d3fcfcd1615909b2f4f651c)
Mickaël Raulet [Sun, 27 Oct 2013 15:50:20 +0000 (16:50 +0100)]
hevc: clean up mvs(cherry picked from commit 955317c09b877a513d3fcfcd1615909b2f4f651c)

Decreases the difference to Anton Khirnovs patch v5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: cosmetic change(cherry picked from commit 3b57513b3f39c04337801fb9d159c7ca8dfa9deb)
Mickaël Raulet [Sun, 27 Oct 2013 14:26:58 +0000 (15:26 +0100)]
hevc: cosmetic change(cherry picked from commit 3b57513b3f39c04337801fb9d159c7ca8dfa9deb)

Decreases the difference to Anton Khirnovs patch v5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: more cosmetic(cherry picked from commit 9697abe41daa234602915f85bf6b1c0ca0252cff)
Mickaël Raulet [Sun, 27 Oct 2013 12:29:50 +0000 (13:29 +0100)]
hevc: more cosmetic(cherry picked from commit 9697abe41daa234602915f85bf6b1c0ca0252cff)

Decreases the difference to Anton Khirnovs patch v5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc : cosmetic changes(cherry picked from commit 7308c0ccf13f18cebe4851e6dcd6b5c0b09...
Mickaël Raulet [Sun, 27 Oct 2013 11:56:48 +0000 (12:56 +0100)]
hevc : cosmetic changes(cherry picked from commit 7308c0ccf13f18cebe4851e6dcd6b5c0b09be1dd)

Decreases the difference to Anton Khirnovs patch v5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc: add support for CODEC_CAP_DELAY in subtitles
Marton Balint [Wed, 23 Oct 2013 18:55:24 +0000 (20:55 +0200)]
lavc: add support for CODEC_CAP_DELAY in subtitles

This patch adds CODEC_CAP_DELAY support to avcodec_decode_subtitle2.

For DVB teletext decoding, a single teletext packet can contain multiple
teletext pages. In order to support that, the teletext decoder may buffer
some pages.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/fbdev_enc: remove unused variables
Lukasz Marek [Sun, 27 Oct 2013 21:35:54 +0000 (22:35 +0100)]
lavd/fbdev_enc: remove unused variables

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc: calculate checksum only if AV_EF_EXPLODE is set
Michael Niedermayer [Sun, 27 Oct 2013 21:22:23 +0000 (22:22 +0100)]
avcodec/hevc: calculate checksum only if AV_EF_EXPLODE is set

This avoids a slowdown with the default of enabled CRC checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRevert "avcodec/options_table: disable CRC checking by default"
Michael Niedermayer [Sun, 27 Oct 2013 21:21:09 +0000 (22:21 +0100)]
Revert "avcodec/options_table: disable CRC checking by default"

This reverts commit c7027ce9eac04fb20bd85fa37dbf24856c080c45.

It appears there is no complete consensus on this currently.

5 years agoRevert "avcodec/options_table: set err_detect to careful by default"
Michael Niedermayer [Sun, 27 Oct 2013 21:20:39 +0000 (22:20 +0100)]
Revert "avcodec/options_table: set err_detect to careful by default"

This reverts commit b1348eb68b432041b2557b9073590cf0fa60ff14.

5 years agolavd/fbdev_enc: more stream validation restrictive
Lukasz Marek [Sun, 27 Oct 2013 20:41:27 +0000 (21:41 +0100)]
lavd/fbdev_enc: more stream validation restrictive

So far fbdev_enc device picked up first video stream and ignored others.
It is required to provide exactly one video stream now.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agolavd/pulse_audio_enc: more stream validation restrictive
Lukasz Marek [Sun, 27 Oct 2013 20:27:39 +0000 (21:27 +0100)]
lavd/pulse_audio_enc: more stream validation restrictive

So far pulse device picked up first audio stream and ignored others.
It is required to provide exactly one audio stream now.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agolavd:pulse_audio_enc: fix array compared against 0
Lukasz Marek [Sun, 27 Oct 2013 20:18:27 +0000 (21:18 +0100)]
lavd:pulse_audio_enc: fix array compared against 0

fixes CID 1113222

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agolavd/pulse_audio_enc: fix timestamp calculation
Lukasz Marek [Thu, 24 Oct 2013 13:11:19 +0000 (15:11 +0200)]
lavd/pulse_audio_enc: fix timestamp calculation

Current implementation didn't include duration of
last processed packet.
Also remove access to st->cur_dts and replace with pkt->pts.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agolibavfilter/vf_noise: relicense to LGPL
Paul B Mahol [Sat, 26 Oct 2013 19:47:28 +0000 (19:47 +0000)]
libavfilter/vf_noise: relicense to LGPL

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/options_table: set err_detect to careful by default
Michael Niedermayer [Sun, 27 Oct 2013 08:17:47 +0000 (09:17 +0100)]
avcodec/options_table: set err_detect to careful by default

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/options_table: disable CRC checking by default
Anton Khirnov [Fri, 25 Oct 2013 14:41:48 +0000 (16:41 +0200)]
avcodec/options_table: disable CRC checking by default

3 runs each of fate-suite/hevc-conformance/ENTP_C_LG_3.bit

with crc flag
1841819858 decicycles in frame decode, 32 runs, 0 skips
1833937180 decicycles in frame decode, 32 runs, 0 skips
1843283884 decicycles in frame decode, 32 runs, 0 skips

without crc flag
1703897301 decicycles in frame decode, 32 runs, 0 skips
1695031879 decicycles in frame decode, 32 runs, 0 skips
1697524383 decicycles in frame decode, 32 runs, 0 skips

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/takdec: also do crc check when er compliant is set
Michael Niedermayer [Sun, 27 Oct 2013 08:28:30 +0000 (09:28 +0100)]
avcodec/takdec: also do crc check when er compliant is set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavio: Check for memory allocation failure of private data
Derek Buitenhuis [Tue, 22 Oct 2013 19:22:13 +0000 (20:22 +0100)]
avio: Check for memory allocation failure of private data

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoavfiltergraph: Properly handle memory allocation failure
Derek Buitenhuis [Tue, 22 Oct 2013 18:40:05 +0000 (19:40 +0100)]
avfiltergraph: Properly handle memory allocation failure

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agotimefilter: Handle memory allocation failure
Derek Buitenhuis [Tue, 22 Oct 2013 17:46:37 +0000 (18:46 +0100)]
timefilter: Handle memory allocation failure

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoavcodec/avcodec.h: Add documentation for the AV_EF_* defifines
Michael Niedermayer [Sun, 27 Oct 2013 18:31:40 +0000 (19:31 +0100)]
avcodec/avcodec.h: Add documentation for the AV_EF_* defifines

The documentation is copied from the AVOption texts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocorrect the AVOption documentation for AV_EF_CAREFUL
Michael Niedermayer [Sun, 27 Oct 2013 18:28:31 +0000 (19:28 +0100)]
correct the AVOption documentation for AV_EF_CAREFUL

The flag was and is intended to be a sane default and thus does not enable
time consuming checks. This also matches how the flag is used in decoders and
demuxers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter: add mergeplanes filter
Paul B Mahol [Fri, 27 Sep 2013 18:37:51 +0000 (18:37 +0000)]
avfilter: add mergeplanes filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoffmpeg_filter: Fix non jpeg yuv in jpeg support
Michael Niedermayer [Wed, 2 Oct 2013 12:16:12 +0000 (14:16 +0200)]
ffmpeg_filter: Fix non jpeg yuv in jpeg support

This is a regression, did not bisect so dont know what caused it but
likely some changes to the command line handling code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: make "first_dts not matching first dts in the queue" message more...
Michael Niedermayer [Sat, 28 Sep 2013 02:06:13 +0000 (04:06 +0200)]
avformat/utils: make "first_dts not matching first dts in the queue" message more informative

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/encoders: replace @xref with @ref command
Stefano Sabatini [Sun, 27 Oct 2013 14:31:38 +0000 (15:31 +0100)]
doc/encoders: replace @xref with @ref command

@xref is ignored by texi2pod.

5 years agovp9: skip itxfm_add if the whole block has no coefficients.
Ronald S. Bultje [Sun, 27 Oct 2013 13:13:11 +0000 (09:13 -0400)]
vp9: skip itxfm_add if the whole block has no coefficients.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/videodsp: Small speedups in ff_emulated_edge_mc x86 SIMD.
Ronald S. Bultje [Sat, 26 Oct 2013 12:24:09 +0000 (08:24 -0400)]
avcodec/x86/videodsp: Small speedups in ff_emulated_edge_mc x86 SIMD.

Don't use word-size multiplications if size == 2, and if we're using
SIMD instructions (size >= 8), complete leftover 4byte sets using movd,
not mov. Both of these changes lead to minor speedups.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/videodsp: fix a bug in a %if statement where we used '%%' instead of...
Ronald S. Bultje [Sat, 26 Oct 2013 12:24:09 +0000 (08:24 -0400)]
avcodec/x86/videodsp: fix a bug in a %if statement where we used '%%' instead of '&&'.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavfi/overlay: correct small error in intersection detection
Benedict Endemann [Sat, 26 Oct 2013 13:22:44 +0000 (15:22 +0200)]
lavfi/overlay: correct small error in intersection detection

The image size of the destination image was used to determine if a source
image was positioned outside the destination image, that no intersection
could occur.  Actually for these two cases the size of the source image
has to be used!

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agovcodec/vc1dec: remove dead code
Michael Niedermayer [Sun, 27 Oct 2013 12:34:35 +0000 (13:34 +0100)]
vcodec/vc1dec: remove dead code

Fixes CID732196

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vc1_parser: check ff_vc1_parse_frame_header*() return value
Michael Niedermayer [Sun, 27 Oct 2013 12:28:08 +0000 (13:28 +0100)]
avcodec/vc1_parser: check ff_vc1_parse_frame_header*() return value

Fixed CID739860

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/tiff: factorize offset init code
Michael Niedermayer [Sun, 27 Oct 2013 12:10:06 +0000 (13:10 +0100)]
avcodec/tiff: factorize offset init code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/tiff: remove TIFF_LONG special case
Michael Niedermayer [Sun, 27 Oct 2013 12:07:44 +0000 (13:07 +0100)]
avcodec/tiff: remove TIFF_LONG special case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/tiff: Fix use of uninitialized off variable
Michael Niedermayer [Sun, 27 Oct 2013 11:43:59 +0000 (12:43 +0100)]
avcodec/tiff: Fix use of uninitialized off variable

Fixes CID1108608

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/encoders: add libshine doc
Timothy Gu [Sun, 27 Oct 2013 03:26:34 +0000 (20:26 -0700)]
doc/encoders: add libshine doc

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agodoc/protocols/rtp: apply misc fixes
Stefano Sabatini [Sun, 27 Oct 2013 11:39:21 +0000 (12:39 +0100)]
doc/protocols/rtp: apply misc fixes

Partially suggested-by Burek Pekaric <burek021@gmail.com>.

5 years agoMAINTAINERS: add my name for Launchpad
Timothy Gu [Sun, 27 Oct 2013 03:26:15 +0000 (20:26 -0700)]
MAINTAINERS: add my name for Launchpad

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevcpred_template: Fix integer overflows
Michael Niedermayer [Sun, 27 Oct 2013 10:50:24 +0000 (11:50 +0100)]
avcodec/hevcpred_template: Fix integer overflows

signed integer overflow is undefined in C

Fixes the following gcc warnings:
In file included from libavcodec/hevcpred.c:27:0:
libavcodec/hevcpred_template.c: In function ‘intra_pred_8’:
libavcodec/hevcpred_template.c:302:9: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow]
In file included from libavcodec/hevcpred.c:31:0:
libavcodec/hevcpred_template.c: In function ‘intra_pred_9’:
libavcodec/hevcpred_template.c:302:9: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow]
In file included from libavcodec/hevcpred.c:35:0:
libavcodec/hevcpred_template.c: In function ‘intra_pred_10’:
libavcodec/hevcpred_template.c:302:9: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'afa93d198aaf2cc661c4df6d4095cd030265d30a'
Michael Niedermayer [Sun, 27 Oct 2013 10:29:09 +0000 (11:29 +0100)]
Merge commit 'afa93d198aaf2cc661c4df6d4095cd030265d30a'

* commit 'afa93d198aaf2cc661c4df6d4095cd030265d30a':
  hevc_parser: Set pict_type, key_frame and output_picture_number.
  hevc: Search start code in decode_nal_units().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc_parser: Set pict_type, key_frame and output_picture_number.
Yusuke Nakamura [Sun, 27 Oct 2013 10:07:43 +0000 (11:07 +0100)]
hevc_parser: Set pict_type, key_frame and output_picture_number.

Conflicts:
libavcodec/hevc.c

5 years agohevc: Search start code in decode_nal_units().
Yusuke Nakamura [Sun, 20 Oct 2013 17:36:51 +0000 (02:36 +0900)]
hevc: Search start code in decode_nal_units().

User may cut off a weird position and send a packet from there.
This avoids returning as invalid data immediately.

5 years agoChangelog: add entry for HEVC support.
Anton Khirnov [Fri, 25 Oct 2013 14:41:55 +0000 (16:41 +0200)]
Changelog: add entry for HEVC support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFATE: update HEVC tests
Guillaume Martres [Fri, 25 Oct 2013 14:41:50 +0000 (16:41 +0200)]
FATE: update HEVC tests

This changes the tests that used the internal hevc checksum to use framecrc

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Conflicts:

tests/fate/hevc.mak
tests/ref/fate/hevc-conformance-DBLK_A_SONY_3
tests/ref/fate/hevc-conformance-DBLK_B_SONY_3
tests/ref/fate/hevc-conformance-DBLK_C_SONY_3
tests/ref/fate/hevc-conformance-DELTAQP_B_SONY_3
tests/ref/fate/hevc-conformance-DELTAQP_C_SONY_3
tests/ref/fate/hevc-conformance-POC_A_Bossen_3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/flacdec: also do crc check when er compliant is set
Michael Niedermayer [Sun, 27 Oct 2013 08:28:30 +0000 (09:28 +0100)]
avcodec/flacdec: also do crc check when er compliant is set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/error_resilience check error_concealment, not err_recognition.
Anton Khirnov [Fri, 25 Oct 2013 14:41:47 +0000 (16:41 +0200)]
avcodec/error_resilience check error_concealment, not err_recognition.

err_recognition is supposed to trigger detecting and reporting errors,
not trying to fix them.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocmdutils: add -colors option
Stefano Sabatini [Thu, 17 Oct 2013 17:04:16 +0000 (19:04 +0200)]
cmdutils: add -colors option

5 years agolavu/parseutils: add av_get_known_color_name()
Stefano Sabatini [Thu, 17 Oct 2013 17:03:40 +0000 (19:03 +0200)]
lavu/parseutils: add av_get_known_color_name()

5 years agoavformat/utils: do not override pts in h264 when they are provided from the demuxer
Michael Niedermayer [Sat, 26 Oct 2013 23:03:19 +0000 (01:03 +0200)]
avformat/utils: do not override pts in h264 when they are provided from the demuxer

Fixes Ticket2143

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/utils: check that size_t is unsigned
Michael Niedermayer [Sat, 26 Oct 2013 20:08:06 +0000 (22:08 +0200)]
avutil/utils: check that size_t is unsigned

ANSI/ISO C guarantee this, yet there is evidence that there exist
platforms where its not so.
See: http://www.cs.utah.edu/dept/old/texinfo/glibc-manual-0.02/library_30.html

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

* qatar/master:
  fft-test: add a missing #include

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b284e1ffe343d6697fb950d1ee517bafda8a9844'
Michael Niedermayer [Sat, 26 Oct 2013 19:36:03 +0000 (21:36 +0200)]
Merge commit 'b284e1ffe343d6697fb950d1ee517bafda8a9844'

* commit 'b284e1ffe343d6697fb950d1ee517bafda8a9844':
  mem: do not check for negative size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/http: dont fail with unknown Content-Encodings
Michael Niedermayer [Sat, 26 Oct 2013 16:54:57 +0000 (18:54 +0200)]
avformat/http: dont fail with unknown Content-Encodings

Fixes: http://m1.file.xiami.com/282/23282/343749/1769075752_709488_l.mp3

Based-on-patch-by: Crossle Song <sxm@yixia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264_parser: heuristically detect non marked keyframes
Michael Niedermayer [Sat, 26 Oct 2013 13:46:43 +0000 (15:46 +0200)]
avcodec/h264_parser: heuristically detect non marked keyframes

Fixes Ticket3083

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/cabac: include get_cabac_bypass_sign_x86() under #if !BROKEN_COMPILER
Michael Niedermayer [Sat, 26 Oct 2013 12:59:05 +0000 (14:59 +0200)]
avcodec/x86/cabac: include get_cabac_bypass_sign_x86() under #if !BROKEN_COMPILER

this might fix Ticket2999 as well as some fate clients
untested as the original patch submitter no longer has the environment to test
this should be reverted if it does not fix the issues

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: link with built libs when pc-uninstalled is used
Lukasz Marek [Sat, 5 Oct 2013 23:25:03 +0000 (01:25 +0200)]
configure: link with built libs when pc-uninstalled is used

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 26 Oct 2013 11:54:25 +0000 (13:54 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: add support for libswresample options
  ffplay: use av_frame_get_pkt_pos instead directly accessing pkt pos
  ffplay: factor out picture freeing code
  ffplay: update and extend documentation for channel and stream switching

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffplay: add support for libswresample options
Marton Balint [Sun, 20 Oct 2013 11:10:36 +0000 (13:10 +0200)]
ffplay: add support for libswresample options

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoffplay: use av_frame_get_pkt_pos instead directly accessing pkt pos
Marton Balint [Sat, 19 Oct 2013 15:25:57 +0000 (17:25 +0200)]
ffplay: use av_frame_get_pkt_pos instead directly accessing pkt pos

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoffplay: factor out picture freeing code
Marton Balint [Fri, 18 Oct 2013 23:18:41 +0000 (01:18 +0200)]
ffplay: factor out picture freeing code

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoffplay: update and extend documentation for channel and stream switching
Marton Balint [Sun, 13 Oct 2013 20:15:39 +0000 (22:15 +0200)]
ffplay: update and extend documentation for channel and stream switching

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoavformat/md5enc: add format, version and column headers
Michael Niedermayer [Sun, 20 Oct 2013 20:53:02 +0000 (22:53 +0200)]
avformat/md5enc: add format, version and column headers

See Ticket2280

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/issue_tracker: add 2 missing issue types
Michael Niedermayer [Fri, 25 Oct 2013 09:41:43 +0000 (11:41 +0200)]
doc/issue_tracker: add 2 missing issue types

Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Sat, 26 Oct 2013 08:30:59 +0000 (10:30 +0200)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/pulse_audio_enc: avoid vars in for()
  lavd/pulse_audio_enc: add another default to stream name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofft-test: add a missing #include
Anton Khirnov [Sat, 26 Oct 2013 07:11:22 +0000 (09:11 +0200)]
fft-test: add a missing #include

stdio.h needed for printf since 7177df90a043bd59e172843fc7cb9e767080ea12

5 years agomem: do not check for negative size
Vittorio Giovara [Fri, 25 Oct 2013 14:41:12 +0000 (16:41 +0200)]
mem: do not check for negative size

size_t is guaranteed to be unsigned

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 26 Oct 2013 00:47:53 +0000 (02:47 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: aac: Add test for AAC-ELD

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'adea4512c6087280702e2423de55cea050e20a98'
Michael Niedermayer [Sat, 26 Oct 2013 00:46:34 +0000 (02:46 +0200)]
Merge commit 'adea4512c6087280702e2423de55cea050e20a98'

* commit 'adea4512c6087280702e2423de55cea050e20a98':
  aacdec: Fix calls to avpriv_report_missing_feature().

See: 435a730e2190c9b005117eaad57f7559cd82581c
See: 72cf47b241c7972cce313e1f474bdb8f3684fa15

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4'
Michael Niedermayer [Sat, 26 Oct 2013 00:36:20 +0000 (02:36 +0200)]
Merge commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4'

* commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4':
  libavutil: x86: Add AVX2 capable CPU detection.

Conflicts:
libavutil/cpu.c
libavutil/cpu.h
libavutil/x86/cpu.c

See: 865b70bc5d1cf37ec6d6cb729a69dda2cca28bd5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAdd AVX2 capable CPU detection. Patch based on x264's AVX2 detection
Kieran Kunhya [Sun, 20 Oct 2013 15:28:38 +0000 (10:28 -0500)]
Add AVX2 capable CPU detection. Patch based on x264's AVX2 detection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/jpeg2000dec: non zero image offsets are not supported
Michael Niedermayer [Sat, 26 Oct 2013 00:19:13 +0000 (02:19 +0200)]
avcodec/jpeg2000dec: non zero image offsets are not supported

Fixes out of array accesses
Fixes Ticket3080
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/pulse_audio_enc: avoid vars in for()
Lukasz Marek [Fri, 25 Oct 2013 23:42:11 +0000 (01:42 +0200)]
lavd/pulse_audio_enc: avoid vars in for()

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agolavd/pulse_audio_enc: add another default to stream name
Lukasz Marek [Thu, 24 Oct 2013 16:10:06 +0000 (18:10 +0200)]
lavd/pulse_audio_enc: add another default to stream name

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agoh264: make flush_change() set mmco_reset
Michael Niedermayer [Fri, 25 Oct 2013 23:22:38 +0000 (01:22 +0200)]
h264: make flush_change() set mmco_reset

This ensures that frames do not get mixed on context reinits

Fixes Ticket2836

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rtpproto: when local rtp port and local rtcp port are not specified, try...
lemonlinger@gmail.com [Sun, 20 Oct 2013 08:53:09 +0000 (16:53 +0800)]
avformat/rtpproto: when local rtp port and local rtcp port are not specified, try to make two successive ports and retry 3 times when failed

some video players on Android will not send udp hole punching messages if the rtcp port and rtp port are not two successive integers.
So, if the video player is behind NAT, it could not receive and rtp messages via udp

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: aac: Add test for AAC-ELD
Alex Converse [Tue, 22 Oct 2013 10:04:47 +0000 (10:04 +0000)]
fate: aac: Add test for AAC-ELD

5 years agoaacdec: Fix calls to avpriv_report_missing_feature().
Alex Converse [Fri, 25 Oct 2013 18:13:13 +0000 (18:13 +0000)]
aacdec: Fix calls to avpriv_report_missing_feature().

It does not take log level as an argument.

5 years agolibavutil: x86: Add AVX2 capable CPU detection.
Kieran Kunhya [Fri, 25 Oct 2013 12:53:56 +0000 (07:53 -0500)]
libavutil: x86: Add AVX2 capable CPU detection.

Patch based on x264's AVX2 detection

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoavcodec/h264: reduce noisiness of "mmco: unref short failure"
Michael Niedermayer [Fri, 25 Oct 2013 18:03:29 +0000 (20:03 +0200)]
avcodec/h264: reduce noisiness of "mmco: unref short failure"

Do not consider it an error if we have no frames and should discard one.
This condition can easily happen when decoding is started from an I frame

Fixes Ticket2811

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mp3dec: perform seek resync in the correct direction
Michael Niedermayer [Fri, 25 Oct 2013 17:35:55 +0000 (19:35 +0200)]
avformat/mp3dec: perform seek resync in the correct direction

Fixes seeking to the last frame in CBR files
Fixes Ticket2773

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rmdec: english typos
Michael Niedermayer [Fri, 25 Oct 2013 17:14:36 +0000 (19:14 +0200)]
avformat/rmdec: english typos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/twinvq: return the actual number of consumed bytes
Michael Niedermayer [Fri, 25 Oct 2013 15:25:26 +0000 (17:25 +0200)]
avcodec/twinvq: return the actual number of consumed bytes

Fixes Ticket2980

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agometasound & twinvqdec: return the number of read bytes from read_bitstream
Michael Niedermayer [Fri, 25 Oct 2013 15:23:13 +0000 (17:23 +0200)]
metasound & twinvqdec: return the number of read bytes from read_bitstream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: abort if threading without atomics is used
Michael Niedermayer [Fri, 25 Oct 2013 14:54:45 +0000 (16:54 +0200)]
configure: abort if threading without atomics is used

also provide a list of workarounds to the user

Fixes Ticket2363

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: add a few links to the Channel Layout syntax section
Stefano Sabatini [Fri, 25 Oct 2013 13:41:35 +0000 (15:41 +0200)]
doc: add a few links to the Channel Layout syntax section

5 years agodoc/utils: document channel layout specification
Stefano Sabatini [Fri, 18 Oct 2013 09:21:21 +0000 (11:21 +0200)]
doc/utils: document channel layout specification

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 25 Oct 2013 11:34:58 +0000 (13:34 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fft-test: Remove possibility of returning restricted exit code
  dct-test: Remove possibility of returning a restricted exit code
  base64-test: Remove posibility of returning restricted exit codes
  tree-test: Don't return restricted exit codes

Conflicts:
libavutil/base64.c

See: b2fdf3fc35b6dca8ac7f6d46bd73ea5eb1339193
See: f80ca1cb002c53927fa3edaff5082bfba24d6193
See: cbbd0ac764b43df081898a2c3548a2fee1faca53
See: 5dfdffeb6fe9c43a496a4c1949cf9162474c7418
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/wavdec: Fix smv packet interleaving
Michael Niedermayer [Fri, 25 Oct 2013 10:50:26 +0000 (12:50 +0200)]
avformat/wavdec: Fix smv packet interleaving

This strips the relative timestamp "flag" off.

Fixes Ticket2849

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 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>
5 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>
5 years agobase64-test: Remove posibility of returning restricted exit codes
Derek Buitenhuis [Tue, 22 Oct 2013 18:11:31 +0000 (19:11 +0100)]
base64-test: Remove posibility of returning restricted exit codes

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agodoc/issue_tracker: remove more mentions of patches
Michael Niedermayer [Fri, 25 Oct 2013 10:03:35 +0000 (12:03 +0200)]
doc/issue_tracker: remove more mentions of patches

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