ffmpeg.git
5 years agoMerge commit '7c61e4b1a0f9e9f5b7bc08879e9e101eb90b19ea'
Michael Niedermayer [Tue, 11 Nov 2014 20:35:53 +0000 (21:35 +0100)]
Merge commit '7c61e4b1a0f9e9f5b7bc08879e9e101eb90b19ea'

* commit '7c61e4b1a0f9e9f5b7bc08879e9e101eb90b19ea':
  hpeldsp: Increase put_no_rnd_pixels_tab[][] size

See: 1e41b8cd072e4f738d9ef75b1ac310a9c8fbcc19
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'db71c4926d948717ce3b74253eb385dc43dcb14d'
Michael Niedermayer [Tue, 11 Nov 2014 20:33:27 +0000 (21:33 +0100)]
Merge commit 'db71c4926d948717ce3b74253eb385dc43dcb14d'

* commit 'db71c4926d948717ce3b74253eb385dc43dcb14d':
  mjpegenc: fix argument size in encode_mb

Conflicts:
libavcodec/mjpegenc.c
libavcodec/mjpegenc.h

See: 256f530603ef3838a712a4fcd737b46b7bce455e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f349f4b5502c94943c30001b8a4d75daded3281c'
Michael Niedermayer [Tue, 11 Nov 2014 20:24:15 +0000 (21:24 +0100)]
Merge commit 'f349f4b5502c94943c30001b8a4d75daded3281c'

* commit 'f349f4b5502c94943c30001b8a4d75daded3281c':
  mpegvideo: fix size of array

See: 9f02d4ed0f72c017dba6fb71d5997c632aa52c08
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d'
Michael Niedermayer [Tue, 11 Nov 2014 20:20:50 +0000 (21:20 +0100)]
Merge commit '898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d'

* commit '898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d':
  mpegvideo: check mpv return value

Conflicts:
libavcodec/mpegvideo.c

See: f4d73f0fb55e0b5931c859ddb4d2d1617b60d560
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba'
Michael Niedermayer [Tue, 11 Nov 2014 20:04:45 +0000 (21:04 +0100)]
Merge commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba'

* commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba':
  mpeg12enc: increase declared size of block function argument

See: 2cf514354bbeebb2334d00ab54c3fcb8ae2ee678
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '52f954da7594c31ad94c9bcb54290145b59b27f5'
Michael Niedermayer [Tue, 11 Nov 2014 19:58:33 +0000 (20:58 +0100)]
Merge commit '52f954da7594c31ad94c9bcb54290145b59b27f5'

* commit '52f954da7594c31ad94c9bcb54290145b59b27f5':
  libavcodec: Unconditionally build xiph.o

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINERS: Add myself as maintainer for Icecast protocol
Marvin Scholz [Tue, 11 Nov 2014 17:24:20 +0000 (18:24 +0100)]
MAINTAINERS: Add myself as maintainer for Icecast protocol

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoIcecast: Use 100-continue if possible for proper error handling
Marvin Scholz [Tue, 11 Nov 2014 01:10:22 +0000 (02:10 +0100)]
Icecast: Use 100-continue if possible for proper error handling

Using 100-continue ffmpeg will only send data if the server confirms it,
so if there is an error with auth or mounpoint, this allows that it is
properly reported to the user. Else ffmpeg sends data and just quits at
some point without an error message.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoIcecast: always send a content-type
Marvin Scholz [Tue, 11 Nov 2014 00:51:23 +0000 (01:51 +0100)]
Icecast: always send a content-type

use a default (audio/mpeg for historical reason) if none. Required since Icecast 2.4.1
Not using AVOption default because this breaks content-type warnings (needs to
detect if no type was set by the user)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc.c: for big negative mvy value, should wait line 0 of ref frame due to...
Changjiang Wei [Tue, 11 Nov 2014 02:39:39 +0000 (10:39 +0800)]
avcodec/hevc.c: for big negative mvy value, should wait line 0 of ref frame due to edge extending

Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohpeldsp: Increase put_no_rnd_pixels_tab[][] size
Michael Niedermayer [Tue, 4 Nov 2014 14:36:53 +0000 (09:36 -0500)]
hpeldsp: Increase put_no_rnd_pixels_tab[][] size

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

5 years agomjpegenc: fix argument size in encode_mb
Vittorio Giovara [Wed, 5 Nov 2014 14:40:30 +0000 (09:40 -0500)]
mjpegenc: fix argument size in encode_mb

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

5 years agolibavcodec/ppc/me_cmp.c : support little endian in sse8_altivec(), hadamard8_diff8x8_...
Rong Yan [Tue, 11 Nov 2014 06:03:01 +0000 (06:03 +0000)]
libavcodec/ppc/me_cmp.c : support little endian in sse8_altivec(), hadamard8_diff8x8_altivec() and hadamard8_diff16x8_altivec()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/ppc/me_cmp.c : factorize little and big endian code
Rong Yan [Tue, 11 Nov 2014 06:03:01 +0000 (06:03 +0000)]
libavcodec/ppc/me_cmp.c : factorize little and big endian code

add marcos GET_PERM() LOAD_PIX() for POWER LE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompegvideo: fix size of array
Vittorio Giovara [Tue, 4 Nov 2014 14:37:01 +0000 (09:37 -0500)]
mpegvideo: fix size of array

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

5 years agompegvideo: check mpv return value
Vittorio Giovara [Tue, 4 Nov 2014 14:37:00 +0000 (09:37 -0500)]
mpegvideo: check mpv return value

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

5 years agompeg12enc: increase declared size of block function argument
Michael Niedermayer [Tue, 4 Nov 2014 14:36:58 +0000 (09:36 -0500)]
mpeg12enc: increase declared size of block function argument

CC: libav-stable@libav.org
Bug-Id: CID 1047236
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agolibavcodec: Unconditionally build xiph.o
Martin Storsjö [Mon, 10 Nov 2014 08:14:45 +0000 (10:14 +0200)]
libavcodec: Unconditionally build xiph.o

vorbis_parser.o is built unconditionally since 5e80fb7ff, and the
unconditionally built parts of it depend on xiph.o.

This fixes builds with --disable-everything.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge commit 'b776113e5d4a56759615196de98efe802e95a6b6'
Michael Niedermayer [Tue, 11 Nov 2014 09:26:28 +0000 (10:26 +0100)]
Merge commit 'b776113e5d4a56759615196de98efe802e95a6b6'

* commit 'b776113e5d4a56759615196de98efe802e95a6b6':
  v4l2: Unify one instance of reading/storing errno

Conflicts:
libavdevice/v4l2.c

See: 60950adc18fe145a235211e75da68ab07123fcaa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agov4l2: Unify one instance of reading/storing errno
Martin Storsjö [Mon, 10 Nov 2014 07:49:01 +0000 (09:49 +0200)]
v4l2: Unify one instance of reading/storing errno

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavcodec/utvideodec: Fix undefined behavior in shift
Michael Niedermayer [Tue, 11 Nov 2014 02:34:58 +0000 (03:34 +0100)]
avcodec/utvideodec: Fix undefined behavior in shift

Fixes: asan_heap-oob_2573085_3783_utvideo_rgba_median.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/lagarith: fix integer overflow
Michael Niedermayer [Tue, 11 Nov 2014 02:19:11 +0000 (03:19 +0100)]
avcodec/lagarith: fix integer overflow

Fixes: asan_heap-oob_1bf48fa_2513_lag-yuy2.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotests/Makefile: New try to fix fate-ffprobe with --target-path.
Carl Eugen Hoyos [Tue, 11 Nov 2014 00:09:31 +0000 (01:09 +0100)]
tests/Makefile: New try to fix fate-ffprobe with --target-path.

5 years agoffserver_config: drop requirement video size being multiple of 16
Lukasz Marek [Sat, 1 Nov 2014 02:00:52 +0000 (03:00 +0100)]
ffserver_config: drop requirement video size being multiple of 16

Such strong requirement constraint doesn't allow to use 360p.
Changed to warning when video size is not being multiple of 2.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoavcodec/wmaprodec: Fix integer overflow in sfb_offsets initialization
Michael Niedermayer [Mon, 10 Nov 2014 22:07:50 +0000 (23:07 +0100)]
avcodec/wmaprodec: Fix integer overflow in sfb_offsets initialization

Fixes out of array read
Fixes: asan_heap-oob_2aec5b0_1828_classical_22_16_2_16000_v3c_0_exclusive_0_29.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agooptions_table.h: min value for colorspace is 0 (AVCOL_SPC_RGB)
Jon Morley [Mon, 10 Nov 2014 18:43:42 +0000 (10:43 -0800)]
options_table.h: min value for colorspace is 0 (AVCOL_SPC_RGB)

The min value for colorspace should be zero and not one since the first
valid index into the frame colorspace array is AVCOL_SPC_RGB which is 0.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/avfoundation: Use internal av_strtok instead of std lib strtok
Thilo Borgmann [Mon, 10 Nov 2014 19:31:14 +0000 (20:31 +0100)]
lavd/avfoundation: Use internal av_strtok instead of std lib strtok

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utvideodec: fix assumtation that slice_height >= 1
Michael Niedermayer [Mon, 10 Nov 2014 18:44:20 +0000 (19:44 +0100)]
avcodec/utvideodec: fix assumtation that slice_height >= 1

Fixes out of array read
Fixes: asan_heap-oob_2573085_3783_utvideo_rgba_median.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/lagarith: fix chroma plane width & height
Michael Niedermayer [Mon, 10 Nov 2014 16:30:44 +0000 (17:30 +0100)]
avcodec/lagarith: fix chroma plane width & height

Fixes out of array read
Fixes: asan_heap-oob_1bf48fa_2513_lag-yuy2.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavfi/xbr: apply misc cosmetical fixes
Stefano Sabatini [Mon, 10 Nov 2014 10:54:59 +0000 (11:54 +0100)]
lavfi/xbr: apply misc cosmetical fixes

5 years agoMerge commit '28396d17ff1c1493b78d6eece484ffc27ed86d0d'
Michael Niedermayer [Mon, 10 Nov 2014 10:38:30 +0000 (11:38 +0100)]
Merge commit '28396d17ff1c1493b78d6eece484ffc27ed86d0d'

* commit '28396d17ff1c1493b78d6eece484ffc27ed86d0d':
  libfdk-aacdec: Support building with the latest version of fdk-aac

See: b44a242c3dfa1225ca4e75135ed5fbe7f0e3c378
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'github/master'
Michael Niedermayer [Mon, 10 Nov 2014 10:25:08 +0000 (11:25 +0100)]
Merge remote-tracking branch 'github/master'

* github/master:
  tests: Fix test name for pixfmts tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibfdk-aacdec: Support building with the latest version of fdk-aac
Martin Storsjö [Tue, 4 Nov 2014 08:22:05 +0000 (10:22 +0200)]
libfdk-aacdec: Support building with the latest version of fdk-aac

The latest fdk-aac code drop (from android 5.0) changed the channel
layout enums (changing the value of existing enum constants), and
renamed the option for downmixing.

The failsafe comparison between ctype and FF_ARRAY_ELEMS(channel_counts)
can trigger warnings (-Wtautological-constant-out-of-range-compare)
when building with the old FDK AAC releases, where it can't be
out of range with the enum values used there.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agotests: Fix test name for pixfmts tests
Timothy Gu [Mon, 10 Nov 2014 05:37:18 +0000 (21:37 -0800)]
tests: Fix test name for pixfmts tests

5 years agodoc/filters: explicit and complete xBR documentation
Clément Bœsch [Mon, 10 Nov 2014 05:36:28 +0000 (06:36 +0100)]
doc/filters: explicit and complete xBR documentation

5 years agoavfilter/xbr: drop yet another x2 reference
Clément Bœsch [Mon, 10 Nov 2014 05:34:11 +0000 (06:34 +0100)]
avfilter/xbr: drop yet another x2 reference

5 years agoavfilter/xbr: fix filter description field
Clément Bœsch [Mon, 10 Nov 2014 05:32:27 +0000 (06:32 +0100)]
avfilter/xbr: fix filter description field

5 years agoavfilter/xbr: fix TODO entry
Clément Bœsch [Mon, 10 Nov 2014 05:28:44 +0000 (06:28 +0100)]
avfilter/xbr: fix TODO entry

5 years agoavfilter/xbr: consistent use of @see
Clément Bœsch [Mon, 10 Nov 2014 05:26:45 +0000 (06:26 +0100)]
avfilter/xbr: consistent use of @see

5 years agoChangelog: explicit that xBR scaler is implemented as a filter
Clément Bœsch [Mon, 10 Nov 2014 05:24:54 +0000 (06:24 +0100)]
Changelog: explicit that xBR scaler is implemented as a filter

5 years agoavfilter/vf_xbr: Uppercase first letter of context type for consistency
Michael Niedermayer [Mon, 10 Nov 2014 02:44:23 +0000 (03:44 +0100)]
avfilter/vf_xbr: Uppercase first letter of context type for consistency

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavfi: add xbr filter xBR
Arwa Arif [Thu, 30 Oct 2014 16:36:20 +0000 (22:06 +0530)]
lavfi: add xbr filter xBR

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: Fix warning: comparison between enum foo and enum bar [-Wenum-compare]
Michael Niedermayer [Mon, 10 Nov 2014 01:54:24 +0000 (02:54 +0100)]
avcodec/utils: Fix warning: comparison between enum foo and enum bar [-Wenum-compare]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: make sidedata remapping table static const
Michael Niedermayer [Mon, 10 Nov 2014 01:53:21 +0000 (02:53 +0100)]
avcodec/utils: make sidedata remapping table static const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibfdk-aacdec: Support building with the latest version of fdk-aac
Martin Storsjö [Sat, 8 Nov 2014 20:39:44 +0000 (22:39 +0200)]
libfdk-aacdec: Support building with the latest version of fdk-aac

The latest fdk-aac code drop (from android 5.0) changed the channel
layout enums (changing the value of existing enum constants), and
renamed the option for downmixing.

The failsafe comparison between ctype and FF_ARRAY_ELEMS(channel_counts)
can trigger warnings (-Wtautological-constant-out-of-range-compare)
when building with the old FDK AAC releases, where it can't be
out of range with the enum values used there.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '09f25533a564eab743f258d168697a11122914c4'
Michael Niedermayer [Mon, 10 Nov 2014 00:36:39 +0000 (01:36 +0100)]
Merge commit '09f25533a564eab743f258d168697a11122914c4'

* commit '09f25533a564eab743f258d168697a11122914c4':
  v4l2: Preserve errno values

Conflicts:
libavdevice/v4l2.c

See: 60950adc18fe145a235211e75da68ab07123fcaa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a1a259881fa7b23e2ffc0c2a43d4923fe42d0478'
Michael Niedermayer [Mon, 10 Nov 2014 00:17:38 +0000 (01:17 +0100)]
Merge commit 'a1a259881fa7b23e2ffc0c2a43d4923fe42d0478'

* commit 'a1a259881fa7b23e2ffc0c2a43d4923fe42d0478':
  v4l2: Use av_strerror

Conflicts:
libavdevice/v4l2.c

See: 60950adc18fe145a235211e75da68ab07123fcaa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e3e317e0c015b164b6c2eb8913e393216d78de23'
Michael Niedermayer [Sun, 9 Nov 2014 23:57:41 +0000 (00:57 +0100)]
Merge commit 'e3e317e0c015b164b6c2eb8913e393216d78de23'

* commit 'e3e317e0c015b164b6c2eb8913e393216d78de23':
  lavc: Compact the side-data passthrough

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale: fix yuv2yuvX_8 assembly on x86
Kieran Kunhya [Sun, 9 Nov 2014 19:39:35 +0000 (20:39 +0100)]
swscale: fix yuv2yuvX_8 assembly on x86

use_mmx_vfilter check/fix by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoSet -scan_all_pmts 1 in ffmpeg, ffplay and ffprobe if not set by user.
Carl Eugen Hoyos [Sun, 9 Nov 2014 17:28:29 +0000 (18:28 +0100)]
Set -scan_all_pmts 1 in ffmpeg, ffplay and ffprobe if not set by user.

Fixes ticket #3762.

5 years agolavu/opt: copy dict in av_opt_copy
Lukasz Marek [Sat, 8 Nov 2014 17:12:56 +0000 (18:12 +0100)]
lavu/opt: copy dict in av_opt_copy

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavu/opt: document av_opt_copy function
Lukasz Marek [Sat, 8 Nov 2014 16:12:29 +0000 (17:12 +0100)]
lavu/opt: document av_opt_copy function

5 years agolavc/options: fix shallow copy context
Lukasz Marek [Sat, 8 Nov 2014 16:01:40 +0000 (17:01 +0100)]
lavc/options: fix shallow copy context

avcodec_copy_context leaves shallow copy of string/binary/dict options.
Double free/accessing freed memory may occur.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoavfilter/avf_showwaves: fix off by one error in loop condition
Marton Balint [Sun, 9 Nov 2014 13:19:36 +0000 (14:19 +0100)]
avfilter/avf_showwaves: fix off by one error in loop condition

It caused segfaults.

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffplay: only output null packet once on EOF
Marton Balint [Mon, 13 Oct 2014 23:15:30 +0000 (01:15 +0200)]
ffplay: only output null packet once on EOF

The generic decoder properly flushes the codecs with one null packet as well.

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoffplay: fix indentation after last commit
Marton Balint [Fri, 24 Oct 2014 13:16:41 +0000 (15:16 +0200)]
ffplay: fix indentation after last commit

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoffplay: implement separete audio decoder thread
Marton Balint [Sat, 19 Oct 2013 12:34:28 +0000 (14:34 +0200)]
ffplay: implement separete audio decoder thread

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agov4l2: Preserve errno values
Luca Barbato [Thu, 6 Nov 2014 08:58:03 +0000 (09:58 +0100)]
v4l2: Preserve errno values

av_log usually resets it.

5 years agoavformat/librtmp: fix swfurl
Michael Niedermayer [Sun, 9 Nov 2014 11:36:23 +0000 (12:36 +0100)]
avformat/librtmp: fix swfurl

Found-by: JULIAN GARDNER <joolzg@btinternet.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agov4l2: Use av_strerror
Tristan Matthews [Wed, 5 Nov 2014 20:09:40 +0000 (15:09 -0500)]
v4l2: Use av_strerror

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agolavc: Compact the side-data passthrough
Luca Barbato [Tue, 4 Nov 2014 20:11:47 +0000 (21:11 +0100)]
lavc: Compact the side-data passthrough

5 years agoavcodec/aacdec: Skip processing channel elements which have not been present
Michael Niedermayer [Sun, 9 Nov 2014 03:25:12 +0000 (04:25 +0100)]
avcodec/aacdec: Skip processing channel elements which have not been present

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/aacenc: check input for NaN
Michael Niedermayer [Sat, 8 Nov 2014 22:32:39 +0000 (23:32 +0100)]
avcodec/aacenc: check input for NaN

Fixes Ticket3762

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegts: improve first valid PMT heuristic
Michael Niedermayer [Sat, 8 Nov 2014 20:25:52 +0000 (21:25 +0100)]
avformat/mpegts: improve first valid PMT heuristic

This checks for audio+video instead of streams > 2
Fixes Ticket4090

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegts: add scan_all_pmts option
Michael Niedermayer [Tue, 4 Nov 2014 00:30:15 +0000 (01:30 +0100)]
avformat/mpegts: add scan_all_pmts option

This allows selecting if the demuxer should consider all streams to be
found after the first PMT and add further streams during decoding or if it rather
should scan all that are within the analyze-duration and other limits

Fixes Ticket3762

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRevert "v4l2: setting device parameters early"
Michael Niedermayer [Sat, 8 Nov 2014 11:43:50 +0000 (12:43 +0100)]
Revert "v4l2: setting device parameters early"

This reverts commit b1ad9312331759679a9c956233716a67ae681d89.

Fixes Ticket #3517

Conflicts:

libavdevice/v4l2.c

Requested-by: Giorgio Vazzana <mywing81@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sat, 8 Nov 2014 11:26:50 +0000 (12:26 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Remove fminf() emulation.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9a5ac36b69ede4563e9ecd734141b12ea3280fbc'
Michael Niedermayer [Sat, 8 Nov 2014 10:41:29 +0000 (11:41 +0100)]
Merge commit '9a5ac36b69ede4563e9ecd734141b12ea3280fbc'

* commit '9a5ac36b69ede4563e9ecd734141b12ea3280fbc':
  movenc: Require samples before trying to write edts

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRemove fminf() emulation.
Carl Eugen Hoyos [Sat, 8 Nov 2014 09:48:37 +0000 (10:48 +0100)]
Remove fminf() emulation.

The emulation is unused and causes compilation trouble on systems
where fminf() is defined in <math.h> but missing from libm.
This should fix compilation on Debian powerpcspe.

5 years agoMerge commit '8cb7b7b461b52898765b38e3eff68c0ce88347f3'
Michael Niedermayer [Sat, 8 Nov 2014 10:08:57 +0000 (11:08 +0100)]
Merge commit '8cb7b7b461b52898765b38e3eff68c0ce88347f3'

* commit '8cb7b7b461b52898765b38e3eff68c0ce88347f3':
  movenc: Avoid leaking locally allocated data when returning on errors

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '95a449d3ce8e15522df47a80a8a4593ea5c2b1bb'
Michael Niedermayer [Sat, 8 Nov 2014 09:57:10 +0000 (10:57 +0100)]
Merge commit '95a449d3ce8e15522df47a80a8a4593ea5c2b1bb'

* commit '95a449d3ce8e15522df47a80a8a4593ea5c2b1bb':
  movenc: Remove an outdated comment

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomovenc: Require samples before trying to write edts
Martin Storsjö [Mon, 3 Nov 2014 18:13:36 +0000 (20:13 +0200)]
movenc: Require samples before trying to write edts

This avoids a potential crash if writing a fragmented psp mp4
(which probably is only a hypothetical scenario).

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agomovenc: Avoid leaking locally allocated data when returning on errors
Martin Storsjö [Sun, 2 Nov 2014 21:50:47 +0000 (23:50 +0200)]
movenc: Avoid leaking locally allocated data when returning on errors

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agomovenc: Remove an outdated comment
Martin Storsjö [Mon, 3 Nov 2014 13:27:42 +0000 (15:27 +0200)]
movenc: Remove an outdated comment

QuickTime does support files with an empty initial movie
these days.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoffmpeg_opt: free incorrect priv_data for feed stream
Lukasz Marek [Fri, 7 Nov 2014 08:05:41 +0000 (09:05 +0100)]
ffmpeg_opt: free incorrect priv_data for feed stream

new_output_stream creates a codec context with arbitraty picked codec.
Later data is updated, but priv_data are left alone.
There is a bit chance there is a mismatch between codecs.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix read-after-free in matroska_read_seek().
Xiaohan Wang [Thu, 6 Nov 2014 20:59:54 +0000 (12:59 -0800)]
Fix read-after-free in matroska_read_seek().

In matroska_read_seek(), |tracks| is assigned at the begining of the function.
However, functions like matroska_parse_cues() could reallocate the tracks so
that |tracks| can get invalidated.

This CL assigns |tracks| only before we use it so that it won't be invalidated.

BUG=427266
TEST=Test case in associated bug passes now.

Change-Id: I9c7065fe8f4311ca846076281df2282d190ed344

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9cbf70fa0e44613590b019cef1fe99aa3f3c5d9d'
Michael Niedermayer [Fri, 7 Nov 2014 23:41:51 +0000 (00:41 +0100)]
Merge commit '9cbf70fa0e44613590b019cef1fe99aa3f3c5d9d'

* commit '9cbf70fa0e44613590b019cef1fe99aa3f3c5d9d':
  movenc: Write correct presentation timestamps in tfra

Conflicts:
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix make checkheaders for libavcodec/vorbis_parser.h.
Carl Eugen Hoyos [Fri, 7 Nov 2014 23:59:37 +0000 (00:59 +0100)]
Fix make checkheaders for libavcodec/vorbis_parser.h.

5 years agoMerge commit 'e7d20f12c5eff5570cd897f3ce3a88456024036b'
Michael Niedermayer [Fri, 7 Nov 2014 23:32:40 +0000 (00:32 +0100)]
Merge commit 'e7d20f12c5eff5570cd897f3ce3a88456024036b'

* commit 'e7d20f12c5eff5570cd897f3ce3a88456024036b':
  movenc: Remove a now redundant check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1d8a0c1b43e58332a3a15c67d4adc161713cade8'
Michael Niedermayer [Fri, 7 Nov 2014 22:59:57 +0000 (23:59 +0100)]
Merge commit '1d8a0c1b43e58332a3a15c67d4adc161713cade8'

* commit '1d8a0c1b43e58332a3a15c67d4adc161713cade8':
  movenc: Allow to request not to use edit lists

Conflicts:
libavformat/movenc.c

See: 537ef8bebf8a35aab448db6ec876e275a10f0f15
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '897d5c3a4296f3da80b8699d1487328ca2de8e55'
Michael Niedermayer [Fri, 7 Nov 2014 22:19:28 +0000 (23:19 +0100)]
Merge commit '897d5c3a4296f3da80b8699d1487328ca2de8e55'

* commit '897d5c3a4296f3da80b8699d1487328ca2de8e55':
  lavf: Print a warning if failed to avoid negative timestamps when requested

Conflicts:
libavformat/mux.c

See: ec6a5fc6cca22e4eb0a91cc8fba786d41ade2032
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1384df641994bf3d6cb51084290aa94752737bae'
Michael Niedermayer [Fri, 7 Nov 2014 21:59:00 +0000 (22:59 +0100)]
Merge commit '1384df641994bf3d6cb51084290aa94752737bae'

* commit '1384df641994bf3d6cb51084290aa94752737bae':
  lavf: Add an option for avoiding negative timestamps

Conflicts:
libavformat/avformat.h
libavformat/mux.c
libavformat/options_table.h
libavformat/version.h

See: 3ba0dab76ac32f0c9f50c916a73bc64e43c1fdf9
See: a89c01253190b9eb9de8e28a3252423bf7732511
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4981baf9b803f3c4866b2e97fdadb008c62dc7ad'
Michael Niedermayer [Fri, 7 Nov 2014 21:32:11 +0000 (22:32 +0100)]
Merge commit '4981baf9b803f3c4866b2e97fdadb008c62dc7ad'

* commit '4981baf9b803f3c4866b2e97fdadb008c62dc7ad':
  avstring: Mark some character handling functions av_const

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/swr: add ff_float_to_int32_a_avx2
James Almer [Thu, 6 Nov 2014 20:38:37 +0000 (17:38 -0300)]
x86/swr: add ff_float_to_int32_a_avx2

13797 decicycles in ff_float_to_int32_a_sse2, 32768 runs, 0 skips
8603 decicycles in ff_float_to_int32_a_avx2, 32766 runs, 2 skips

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavcodec/mjpegdec: support pix fmt id 0x22111111
Michael Niedermayer [Fri, 7 Nov 2014 14:37:11 +0000 (15:37 +0100)]
avcodec/mjpegdec: support pix fmt id 0x22111111

Fixes: 4163724_300.jpg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/ppc/util_altivec: add () to VEC_LD macro arguments
Michael Niedermayer [Fri, 7 Nov 2014 14:13:47 +0000 (15:13 +0100)]
avutil/ppc/util_altivec: add () to VEC_LD macro arguments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/ppc/util_altivec: make src pointers const, fix warnings
Michael Niedermayer [Fri, 7 Nov 2014 13:42:17 +0000 (14:42 +0100)]
avutil/ppc/util_altivec: make src pointers const, fix warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomovenc: Write correct presentation timestamps in tfra
Martin Storsjö [Sat, 11 Oct 2014 21:24:31 +0000 (00:24 +0300)]
movenc: Write correct presentation timestamps in tfra

Previously we wrote decoding timestamps here, while the specs
say it should be presentation timestamps.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agomovenc: Remove a now redundant check
Martin Storsjö [Wed, 29 Oct 2014 21:26:40 +0000 (23:26 +0200)]
movenc: Remove a now redundant check

When using the new first_trun flag instead of checking the track id,
we don't need to have a special case for the separate_moof flag
any longer.

This simplifies the complicated codepath ever so slightly.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agolibavcodec/ppc/hpeldsp_altivec.c : fix ff_put_pixels16_altivec() put_no_rnd_pixels16_...
Rong Yan [Fri, 7 Nov 2014 09:07:29 +0000 (09:07 +0000)]
libavcodec/ppc/hpeldsp_altivec.c : fix ff_put_pixels16_altivec() put_no_rnd_pixels16_xy2_altivec() put_no_rnd_pixels8_xy2_altivec() avg_pixels8_altivec() avg_pixels8_xy2_altivec() put_pixels16_xy2_altivec() put_pixels8_xy2_altivec() ff_avg_pixels16_altivec() for POWER LE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomovenc: Allow to request not to use edit lists
Martin Storsjö [Tue, 4 Nov 2014 14:28:48 +0000 (16:28 +0200)]
movenc: Allow to request not to use edit lists

In this case, shift tracks to start from zero instead (potentially
stretching the first sample in tracks that start later than the
first one).

Some software does not support edit lists at all, the adobe flash
player seems to be one of these. This results in AV sync errors when
edit lists are used to adjust AV sync.

Some players, such as QuickTime, don't respect the duration for
audio packets, so if an audio track starts later than the video
track and the first audio sample gets a duration longer than the
actual amount of data in it, the result will be out of sync.

Based on patches by Michael Niedermayer.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agolavf: Print a warning if failed to avoid negative timestamps when requested
Michael Niedermayer [Wed, 22 Oct 2014 14:15:02 +0000 (16:15 +0200)]
lavf: Print a warning if failed to avoid negative timestamps when requested

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agolavf: Add an option for avoiding negative timestamps
Michael Niedermayer [Wed, 26 Sep 2012 13:55:16 +0000 (15:55 +0200)]
lavf: Add an option for avoiding negative timestamps

This is the same logic as is invoked on AVFMT_TS_NEGATIVE,
but which can be enabled manually, or can be enabled
in muxers which only need it in certain conditions.

Also allow using the same mechanism to force streams to start
at 0.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavstring: Mark some character handling functions av_const
Henrik Gramner [Tue, 4 Nov 2014 23:05:42 +0000 (00:05 +0100)]
avstring: Mark some character handling functions av_const

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agolibavutil/ppc/util_altivec.h : fix unaligned_load() vec_unaligned_load() add macros...
Rong Yan [Fri, 7 Nov 2014 08:57:49 +0000 (08:57 +0000)]
libavutil/ppc/util_altivec.h : fix unaligned_load() vec_unaligned_load() add macros VEC_LD() VEC_MERGEH() VEC_MERGEL() VEC_ST() for POWER LE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/webpenc: preserve single image VP8X flags
Michael Niedermayer [Fri, 7 Nov 2014 03:08:18 +0000 (04:08 +0100)]
avformat/webpenc: preserve single image VP8X flags

Fixes Ticket4087

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/aacdec: Add table of profile names
Michael Niedermayer [Fri, 7 Nov 2014 01:26:16 +0000 (02:26 +0100)]
avcodec/aacdec: Add table of profile names

based on tables of aac encoders from libavcodec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/aacdec: print extension type when startcode debugging is on
Michael Niedermayer [Fri, 7 Nov 2014 01:25:32 +0000 (02:25 +0100)]
avcodec/aacdec: print extension type when startcode debugging is on

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/swr: replace sse4 instructions in pack_6ch with sse ones
James Almer [Thu, 6 Nov 2014 23:43:06 +0000 (20:43 -0300)]
x86/swr: replace sse4 instructions in pack_6ch with sse ones

There's no benefit from using blendps here except on CPUs with AVX, where
it's faster than shufps according to Intel's documentation.
As such, rename the sse4 functions to sse/sse2 and use shufps instead.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agolavd/avfoundation: Update documentation to mention audio capabilities.
Thilo Borgmann [Thu, 6 Nov 2014 20:28:12 +0000 (21:28 +0100)]
lavd/avfoundation: Update documentation to mention audio capabilities.

Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>