ffmpeg.git
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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.

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

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

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

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

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

4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 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>
4 years agoMerge commit '199d9f995da53fe2507821f6d96bbc692574e1a9'
Michael Niedermayer [Thu, 6 Nov 2014 17:27:58 +0000 (18:27 +0100)]
Merge commit '199d9f995da53fe2507821f6d96bbc692574e1a9'

* commit '199d9f995da53fe2507821f6d96bbc692574e1a9':
  mjpegdec: fix undefined shift

Conflicts:
libavcodec/mjpegdec.c

See: b4329605289e25bb071ec1c1182bf25fc83b09aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1'
Michael Niedermayer [Thu, 6 Nov 2014 17:16:38 +0000 (18:16 +0100)]
Merge commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1'

* commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1':
  pthreads_frame: Do not leak on failure path

See: 11679e1b90f6e52a3643efb45d06ea5adf65098a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5d29efe4b0154ce305d66fed2ac23e5842439256'
Michael Niedermayer [Thu, 6 Nov 2014 16:34:05 +0000 (17:34 +0100)]
Merge commit '5d29efe4b0154ce305d66fed2ac23e5842439256'

* commit '5d29efe4b0154ce305d66fed2ac23e5842439256':
  mpeg12dec: simplify context duplication

Not merged, theres no point in copying data and afterwards zeroing it
Also zeroing is not correct on its own

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '37b3361e755361d4ff14a2973df001c0140d98d6'
Michael Niedermayer [Thu, 6 Nov 2014 16:28:06 +0000 (17:28 +0100)]
Merge commit '37b3361e755361d4ff14a2973df001c0140d98d6'

* commit '37b3361e755361d4ff14a2973df001c0140d98d6':
  mpeg12enc: factor out check in encode_dc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0a6664706168dc1049967bec311970d720581625'
Michael Niedermayer [Thu, 6 Nov 2014 16:21:11 +0000 (17:21 +0100)]
Merge commit '0a6664706168dc1049967bec311970d720581625'

* commit '0a6664706168dc1049967bec311970d720581625':
  mpegvideo_enc: factor out denominator and explicitly cast operands

Conflicts:
libavcodec/mpegvideo_enc.c

See: c753b56b4d56724284dd7ed972efdb843db80f12
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e0a1d0a2b04eb5220d00fc7ce46a57cc5e3c7118'
Michael Niedermayer [Thu, 6 Nov 2014 16:14:18 +0000 (17:14 +0100)]
Merge commit 'e0a1d0a2b04eb5220d00fc7ce46a57cc5e3c7118'

* commit 'e0a1d0a2b04eb5220d00fc7ce46a57cc5e3c7118':
  mpegvideo_enc: rework direct mode check

Conflicts:
libavcodec/mpegvideo_enc.c

See: ad985671986464015f3136ad6882ef232c19fc22
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomjpegdec: fix undefined shift
Vittorio Giovara [Wed, 5 Nov 2014 15:29:55 +0000 (10:29 -0500)]
mjpegdec: fix undefined shift

Add a comment to explain the code.

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

4 years agopthreads_frame: Do not leak on failure path
Luca Barbato [Thu, 30 Oct 2014 00:51:59 +0000 (00:51 +0000)]
pthreads_frame: Do not leak on failure path

CC: libav-stable@libav.org
Bug-Id: CID 1135767
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agompeg12dec: simplify context duplication
Vittorio Giovara [Tue, 4 Nov 2014 14:36:59 +0000 (09:36 -0500)]
mpeg12dec: simplify context duplication

CC: libav-stable@libav.org
Bug-Id: CID 717453 / CID 717454 / CID 717915

4 years agompeg12enc: factor out check in encode_dc
Vittorio Giovara [Tue, 4 Nov 2014 14:36:57 +0000 (09:36 -0500)]
mpeg12enc: factor out check in encode_dc

Makes coverity less confused and the code more readable.

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

4 years agompegvideo_enc: factor out denominator and explicitly cast operands
Vittorio Giovara [Tue, 4 Nov 2014 14:37:04 +0000 (09:37 -0500)]
mpegvideo_enc: factor out denominator and explicitly cast operands

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

4 years agompegvideo_enc: rework direct mode check
Vittorio Giovara [Tue, 4 Nov 2014 14:37:03 +0000 (09:37 -0500)]
mpegvideo_enc: rework direct mode check

Remove stray semicolon and share codepaths.

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

4 years agoavfilter/af_aresample: remove unused variable
Michael Niedermayer [Thu, 6 Nov 2014 14:58:28 +0000 (15:58 +0100)]
avfilter/af_aresample: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavd/v4l2: use pixel format variable names consistently
Giorgio Vazzana [Thu, 6 Nov 2014 10:30:41 +0000 (11:30 +0100)]
lavd/v4l2: use pixel format variable names consistently

We now use 'pixelformat' for V4L2_PIX_FMT_* (as they do in v4l2
documentation) and 'pix_fmt' for AVPixelFormat.

No functional change in the code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/riffenc: move MP3 LSF threshold to the midway point between the 2
Michael Niedermayer [Thu, 6 Nov 2014 13:52:18 +0000 (14:52 +0100)]
avformat/riffenc: move MP3 LSF threshold to the midway point between the 2

No testcase available but this seems more correct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/yuv4mpegenc: Use AVFormatContext strict_std_compliance instead of AVCodecContext
Michael Niedermayer [Thu, 6 Nov 2014 13:48:50 +0000 (14:48 +0100)]
avformat/yuv4mpegenc: Use AVFormatContext strict_std_compliance instead of AVCodecContext

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mmf: Use AVFormatContext strict_std_compliance instead of AVCodecContext
Michael Niedermayer [Thu, 6 Nov 2014 13:48:23 +0000 (14:48 +0100)]
avformat/mmf: Use AVFormatContext strict_std_compliance instead of AVCodecContext

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/flvenc: Use AVFormatContext strict_std_compliance instead of AVCodecContext
Michael Niedermayer [Thu, 6 Nov 2014 13:47:43 +0000 (14:47 +0100)]
avformat/flvenc: Use AVFormatContext strict_std_compliance instead of AVCodecContext

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/xiph: make extradata argument const
Michael Niedermayer [Thu, 6 Nov 2014 13:41:38 +0000 (14:41 +0100)]
avcodec/xiph: make extradata argument const

Fixes "warning: passing argument 1 of avpriv_split_xiph_headers discards const qualifier from pointer target type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '05e59135b3539062465b5005b6d46ec0418a5fc4'
Michael Niedermayer [Thu, 6 Nov 2014 13:23:53 +0000 (14:23 +0100)]
Merge commit '05e59135b3539062465b5005b6d46ec0418a5fc4'

* commit '05e59135b3539062465b5005b6d46ec0418a5fc4':
  nutdec: do not set has_b_frames

Not merged, this change is not correct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48'
Michael Niedermayer [Thu, 6 Nov 2014 13:17:34 +0000 (14:17 +0100)]
Merge commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48'

* commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48':
  lavc: make avpriv_flac_is_extradata_valid() private on the next bump

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e839de0f851535b5e19256b52f9865f0cb768a7c'
Michael Niedermayer [Thu, 6 Nov 2014 13:09:35 +0000 (14:09 +0100)]
Merge commit 'e839de0f851535b5e19256b52f9865f0cb768a7c'

* commit 'e839de0f851535b5e19256b52f9865f0cb768a7c':
  oggenc: accept only STREAMINFO extradata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c070a8751597e3aa1b443e88464da785d8966b14'
Michael Niedermayer [Thu, 6 Nov 2014 12:54:03 +0000 (13:54 +0100)]
Merge commit 'c070a8751597e3aa1b443e88464da785d8966b14'

* commit 'c070a8751597e3aa1b443e88464da785d8966b14':
  lavc: make avpriv_flac_parse_streaminfo() private on the next bump

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c'
Michael Niedermayer [Thu, 6 Nov 2014 12:41:07 +0000 (13:41 +0100)]
Merge commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c'

* commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c':
  lavf: stop using avpriv_flac_parse_streaminfo()

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '56dc46a1893251e74be1ad63e54fb38d754bb1fe'
Michael Niedermayer [Thu, 6 Nov 2014 12:18:42 +0000 (13:18 +0100)]
Merge commit '56dc46a1893251e74be1ad63e54fb38d754bb1fe'

* commit '56dc46a1893251e74be1ad63e54fb38d754bb1fe':
  riffenc: do not fall back on AVCodecContext.frame_size for MP3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e'
Michael Niedermayer [Thu, 6 Nov 2014 12:10:01 +0000 (13:10 +0100)]
Merge commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e'

* commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e':
  lavf: use the format context strict_std_compliance instead of the codec one

Conflicts:
libavformat/mux.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/oggparsevorbis: Check that initialization succeeded before declaring the...
Michael Niedermayer [Thu, 6 Nov 2014 11:58:04 +0000 (12:58 +0100)]
avformat/oggparsevorbis: Check that initialization succeeded before declaring the end of headers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/oggparsevorbis: return proper error code from vorbis_header()
Michael Niedermayer [Thu, 6 Nov 2014 12:01:06 +0000 (13:01 +0100)]
avformat/oggparsevorbis: return proper error code from vorbis_header()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959'
Michael Niedermayer [Thu, 6 Nov 2014 11:05:17 +0000 (12:05 +0100)]
Merge commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959'

* commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959':
  lavc,lavf: switch to the new vorbis parse API

Conflicts:
libavformat/oggparsevorbis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/export av_vorbis_parse_frame_flags()
Michael Niedermayer [Thu, 6 Nov 2014 10:54:40 +0000 (11:54 +0100)]
avcodec/export av_vorbis_parse_frame_flags()

The other functions where changed in the previous merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70'
Michael Niedermayer [Thu, 6 Nov 2014 10:21:47 +0000 (11:21 +0100)]
Merge commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70'

* commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70':
  lavc: add a public API for parsing vorbis packets.

Conflicts:
doc/APIchanges
libavcodec/Makefile
libavcodec/version.h
libavcodec/vorbis_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67'
Michael Niedermayer [Thu, 6 Nov 2014 10:00:42 +0000 (11:00 +0100)]
Merge commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67'

* commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67':
  vorbis_parser: add an AV prefix to VorbisParseContext

Conflicts:
libavcodec/vorbis_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8747926'
Michael Niedermayer [Thu, 6 Nov 2014 09:50:59 +0000 (10:50 +0100)]
Merge commit '8747926'

* commit '8747926':
  vorbis_parser: use a dedicated AVClass for logging

Conflicts:
libavcodec/vorbis_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agonutdec: do not set has_b_frames
Anton Khirnov [Thu, 30 Oct 2014 06:51:15 +0000 (07:51 +0100)]
nutdec: do not set has_b_frames

It is not supposed to be set by demuxers.

4 years agolavc: make avpriv_flac_is_extradata_valid() private on the next bump
Anton Khirnov [Thu, 28 Aug 2014 18:42:56 +0000 (18:42 +0000)]
lavc: make avpriv_flac_is_extradata_valid() private on the next bump

4 years agooggenc: accept only STREAMINFO extradata
Anton Khirnov [Thu, 28 Aug 2014 18:51:51 +0000 (18:51 +0000)]
oggenc: accept only STREAMINFO extradata

The reasoning is the same as for
0097cbea695e534fce39958ccd103af2fbf65831.

4 years agolavc: make avpriv_flac_parse_streaminfo() private on the next bump
Anton Khirnov [Thu, 28 Aug 2014 18:42:56 +0000 (18:42 +0000)]
lavc: make avpriv_flac_parse_streaminfo() private on the next bump

4 years agolavf: stop using avpriv_flac_parse_streaminfo()
Anton Khirnov [Thu, 28 Aug 2014 10:13:25 +0000 (10:13 +0000)]
lavf: stop using avpriv_flac_parse_streaminfo()

The only parameters needed by the demuxers are the sample rate and sample
count, which can be trivially extracted manually, without resorting to
an avpriv function.

4 years agoriffenc: do not fall back on AVCodecContext.frame_size for MP3
Anton Khirnov [Sun, 24 Aug 2014 10:28:32 +0000 (10:28 +0000)]
riffenc: do not fall back on AVCodecContext.frame_size for MP3

It will not be set unless the codec context is used as the encoding
context, which is discouraged. For MP2, av_get_audio_frame_duration()
will already set the frame size properly. For MP3, set the frame size
explicitly.

4 years agolavf: use the format context strict_std_compliance instead of the codec one
Anton Khirnov [Sat, 5 Jul 2014 09:56:16 +0000 (09:56 +0000)]
lavf: use the format context strict_std_compliance instead of the codec one

4 years agolavc,lavf: switch to the new vorbis parse API
Anton Khirnov [Wed, 29 Oct 2014 15:35:26 +0000 (16:35 +0100)]
lavc,lavf: switch to the new vorbis parse API