ffmpeg.git
5 years agolavf/ffm: use AVOption API to store/restore stream properties
Lukasz Marek [Tue, 11 Nov 2014 07:20:02 +0000 (08:20 +0100)]
lavf/ffm: use AVOption API to store/restore stream properties

This is a generic solution that will not reqiore modifications when new options are added.
This also fixes problem with current implementation when qmin or qmax=-1.
Only 8 bits was sent and read back as 255.

Fixes #1275
Fixes #1461

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoffserver_config: handle codec private options
Lukasz Marek [Mon, 10 Nov 2014 22:21:34 +0000 (23:21 +0100)]
ffserver_config: handle codec private options

This commit allows to set codec's private option.
As side effect, it also improves preset support.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoffmpeg_opt: use codec private context in ffserver streams
Lukasz Marek [Tue, 11 Nov 2014 04:19:27 +0000 (05:19 +0100)]
ffmpeg_opt: use codec private context in ffserver streams

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavf/ffm: store/restore private codec context
Lukasz Marek [Mon, 10 Nov 2014 22:22:59 +0000 (23:22 +0100)]
lavf/ffm: store/restore private codec context

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavu/opt: introduce av_opt_serialize()
Lukasz Marek [Mon, 10 Nov 2014 21:28:44 +0000 (22:28 +0100)]
lavu/opt: introduce av_opt_serialize()

Function allows to create string containing object's serialized options.
Such string may be passed back to av_set_options_string() in order to restore options.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavu/opt: introduce av_opt_is_set_to_default()
Lukasz Marek [Mon, 10 Nov 2014 21:25:30 +0000 (22:25 +0100)]
lavu/opt: introduce av_opt_is_set_to_default()

New function allows to check if option is set to its default value

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavc/options: initialize pkt_timebase
Lukasz Marek [Sat, 15 Nov 2014 19:57:14 +0000 (20:57 +0100)]
lavc/options: initialize pkt_timebase

It's default in option_table.h is 0, but without this fix it is represented as 0/0.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavc/options: set timecode_frame_start to -1 as option default
Lukasz Marek [Sat, 15 Nov 2014 19:27:17 +0000 (20:27 +0100)]
lavc/options: set timecode_frame_start to -1 as option default

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavc/options_table: add pixel_format and video_size options
Lukasz Marek [Tue, 11 Nov 2014 07:17:26 +0000 (08:17 +0100)]
lavc/options_table: add pixel_format and video_size options

Adding these options simplify ffm format implementation based on AVOption API.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavc/options_table: set min to -1 for timecode_frame_start
Lukasz Marek [Tue, 11 Nov 2014 07:15:17 +0000 (08:15 +0100)]
lavc/options_table: set min to -1 for timecode_frame_start

timecode_frame_start is set to -1 in avcodec_get_context_defaults3()
AVOptions API complains about it.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoavfilter/vf_tinterlace: remove unused variable
Michael Niedermayer [Sun, 16 Nov 2014 00:06:18 +0000 (01:06 +0100)]
avfilter/vf_tinterlace: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c00365b46d464ce47716315c1801818d811bdb9a'
Michael Niedermayer [Sat, 15 Nov 2014 23:52:31 +0000 (00:52 +0100)]
Merge commit 'c00365b46d464ce47716315c1801818d811bdb9a'

* commit 'c00365b46d464ce47716315c1801818d811bdb9a':
  aarch64: Make the function pointer tables position independent

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoaarch64: Make the function pointer tables position independent
Martin Storsjö [Tue, 11 Nov 2014 22:00:04 +0000 (00:00 +0200)]
aarch64: Make the function pointer tables position independent

This allows running the code on android, where 64 bit binaries with
text relocations aren't allowed to be loaded.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavfilter/xbr: fix style in FILT4() calls
Clément Bœsch [Sat, 15 Nov 2014 21:48:22 +0000 (22:48 +0100)]
avfilter/xbr: fix style in FILT4() calls

5 years agoavfilter/xbr: clarify default "interpolated" pixels assignments
Clément Bœsch [Sat, 15 Nov 2014 21:46:19 +0000 (22:46 +0100)]
avfilter/xbr: clarify default "interpolated" pixels assignments

5 years agoavfilter/xbr: refactor xbr[234]x into a single function
Clément Bœsch [Sat, 15 Nov 2014 21:34:53 +0000 (22:34 +0100)]
avfilter/xbr: refactor xbr[234]x into a single function

No speed difference.

5 years agoavfilter/xbr: add slice threading
Clément Bœsch [Sat, 15 Nov 2014 21:15:07 +0000 (22:15 +0100)]
avfilter/xbr: add slice threading

5 years agoavcodec/nellymoserenc: update comment to match 5c805d69a49a1f32a7a8a1b16fb3d631d85ca56d
Michael Niedermayer [Sat, 15 Nov 2014 21:07:11 +0000 (22:07 +0100)]
avcodec/nellymoserenc: update comment to match 5c805d69a49a1f32a7a8a1b16fb3d631d85ca56d

Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/xbr: add video and filtering flags to options
Clément Bœsch [Sat, 15 Nov 2014 20:22:00 +0000 (21:22 +0100)]
avfilter/xbr: add video and filtering flags to options

Fixes ffmpeg -h filter=xbr

5 years agoavfilter/xbr: use function pointers for xbr[234]x
Clément Bœsch [Sat, 15 Nov 2014 20:18:18 +0000 (21:18 +0100)]
avfilter/xbr: use function pointers for xbr[234]x

5 years agoavfilter/xbr: remove FATE test entry from @todo
Clément Bœsch [Sat, 15 Nov 2014 20:13:18 +0000 (21:13 +0100)]
avfilter/xbr: remove FATE test entry from @todo

See 57688aecbd720f4b02acc65b5006b14b7dd6a9f4

5 years agoavfilter/xbr: consistent copyright header
Clément Bœsch [Sat, 15 Nov 2014 19:49:44 +0000 (20:49 +0100)]
avfilter/xbr: consistent copyright header

5 years agoavfilter/xbr: make xbr[234]x a bit more consistent
Clément Bœsch [Sat, 15 Nov 2014 20:04:49 +0000 (21:04 +0100)]
avfilter/xbr: make xbr[234]x a bit more consistent

5 years agoavfilter/xbr: misc style fixes
Clément Bœsch [Sat, 15 Nov 2014 19:55:30 +0000 (20:55 +0100)]
avfilter/xbr: misc style fixes

5 years agoavfilter/xbr: simplify left/up conditions
Clément Bœsch [Sat, 15 Nov 2014 19:53:55 +0000 (20:53 +0100)]
avfilter/xbr: simplify left/up conditions

5 years agoavfilter/xbr: misc cleanup in FILT[234] macros
Clément Bœsch [Sat, 15 Nov 2014 12:15:27 +0000 (13:15 +0100)]
avfilter/xbr: misc cleanup in FILT[234] macros

5 years agoavfilter/xbr: refactor src/dst pointers definitions into a macro
Clément Bœsch [Thu, 13 Nov 2014 23:00:44 +0000 (00:00 +0100)]
avfilter/xbr: refactor src/dst pointers definitions into a macro

5 years agoavfilter/xbr: refactor the 21 pixels definition into a macro
Clément Bœsch [Thu, 13 Nov 2014 22:52:35 +0000 (23:52 +0100)]
avfilter/xbr: refactor the 21 pixels definition into a macro

5 years agoavfilter/xbr: mark source pointers as const
Clément Bœsch [Thu, 13 Nov 2014 22:40:56 +0000 (23:40 +0100)]
avfilter/xbr: mark source pointers as const

5 years agoavfilter/xbr: simplify width overread checks
Clément Bœsch [Thu, 13 Nov 2014 20:20:52 +0000 (21:20 +0100)]
avfilter/xbr: simplify width overread checks

5 years agoavfilter/xbr: use different macro names for each dimension
Clément Bœsch [Tue, 11 Nov 2014 23:33:41 +0000 (00:33 +0100)]
avfilter/xbr: use different macro names for each dimension

5 years agoavfilter/xbr: avoid unecessary macro redirections
Clément Bœsch [Tue, 11 Nov 2014 23:12:07 +0000 (00:12 +0100)]
avfilter/xbr: avoid unecessary macro redirections

5 years agoavfilter/xbr: localize some filtering variables
Clément Bœsch [Tue, 11 Nov 2014 20:28:43 +0000 (21:28 +0100)]
avfilter/xbr: localize some filtering variables

5 years agoavfilter/xbr: do not pass unchanging r2y to macros
Clément Bœsch [Tue, 11 Nov 2014 20:22:07 +0000 (21:22 +0100)]
avfilter/xbr: do not pass unchanging r2y to macros

5 years agolavfi/xbr: remove relicensing notice from copyright header
Stefano Sabatini [Sat, 15 Nov 2014 18:47:16 +0000 (19:47 +0100)]
lavfi/xbr: remove relicensing notice from copyright header

The log is good enough for tracking those changes.

5 years agoMerge commit '2fa6d21124bd2fc0b186290f5313179263bfcfb7'
Michael Niedermayer [Sat, 15 Nov 2014 18:22:30 +0000 (19:22 +0100)]
Merge commit '2fa6d21124bd2fc0b186290f5313179263bfcfb7'

* commit '2fa6d21124bd2fc0b186290f5313179263bfcfb7':
  on2avc: Fix out of array access

See: ce6a1ff2a124b3b0e8530bca1b6eed5a368feb5a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c'
Michael Niedermayer [Sat, 15 Nov 2014 18:09:30 +0000 (19:09 +0100)]
Merge commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c'

* commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c':
  dv: Drop a spurious check

Conflicts:
libavcodec/dvdec.c

See: 5307fa00a45b50897af3d5070e936fcaa82ae19e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavfi : change xBR filter to LGPL
Arwa Arif [Sat, 15 Nov 2014 07:59:31 +0000 (13:29 +0530)]
lavfi : change xBR filter to LGPL

Hyllian's message : "Hi, Put lgpl on this and use it as you wish. It's free!"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpeg4video_parser: fix spurious extradata parse warnings
Michael Niedermayer [Sat, 15 Nov 2014 16:30:44 +0000 (17:30 +0100)]
avcodec/mpeg4video_parser: fix spurious extradata parse warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpeg4videodec: replace some return -1 by more specific error codes
Michael Niedermayer [Sat, 15 Nov 2014 16:24:36 +0000 (17:24 +0100)]
avcodec/mpeg4videodec: replace some return -1 by more specific error codes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpeg4videodec: forward return code in ff_mpeg4_decode_picture_header()
Michael Niedermayer [Sat, 15 Nov 2014 16:09:37 +0000 (17:09 +0100)]
avcodec/mpeg4videodec: forward return code in ff_mpeg4_decode_picture_header()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/http: simplify chained_options copying
Michael Niedermayer [Sat, 15 Nov 2014 13:24:09 +0000 (14:24 +0100)]
avformat/http: simplify chained_options copying

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix the timeout option not working when connecting to a HTTP url that requires authen...
Brandon Lees [Fri, 14 Nov 2014 23:05:44 +0000 (18:05 -0500)]
Fix the timeout option not working when connecting to a HTTP url that requires authentication.

In http_open_cnx, the patch restores the AVDictionary if connection needs to be re-tried
because of a authentication/redirect status code.

Previously, if a 401/407/30x status code was encountered, http_open_cnx would restart at the redo label, but any options
used by the underlying protocol would be missing because they were removed by the first attempt.

Signed-off-by: Brandon Lees <brandon@n-hega.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dvdsubdec: New option for obtaining global palette from .IFO file (experimental)
Shin-ichi Toyama [Sat, 15 Nov 2014 03:42:30 +0000 (12:42 +0900)]
avcodec/dvdsubdec: New option for obtaining global palette from .IFO file (experimental)

Suggested-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoon2avc: Fix out of array access
Michael Niedermayer [Wed, 12 Nov 2014 10:13:01 +0000 (11:13 +0100)]
on2avc: Fix out of array access

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

5 years agodv: Drop a spurious check
Luca Barbato [Wed, 12 Nov 2014 18:10:39 +0000 (19:10 +0100)]
dv: Drop a spurious check

The buffer is always valid.

Bug-Id: CID 700682

5 years agomov.c: fix handling of seek return in read_mfra
Mika Raento [Fri, 14 Nov 2014 17:12:34 +0000 (19:12 +0200)]
mov.c: fix handling of seek return in read_mfra

this would cause mfra to be ignored in files larger than 2G

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8562c1483ba647f562e4c1df68a9231274b80e6b'
Michael Niedermayer [Sat, 15 Nov 2014 10:51:45 +0000 (11:51 +0100)]
Merge commit '8562c1483ba647f562e4c1df68a9231274b80e6b'

* commit '8562c1483ba647f562e4c1df68a9231274b80e6b':
  Icecast: Send content-type in all cases

See: 5e08b54f47e8168e1f8203d9b5d0d1fba3c9f822
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3a6bb9735053c453f806ceab1d91124648d90aca'
Michael Niedermayer [Sat, 15 Nov 2014 10:28:06 +0000 (11:28 +0100)]
Merge commit '3a6bb9735053c453f806ceab1d91124648d90aca'

* commit '3a6bb9735053c453f806ceab1d91124648d90aca':
  Icecast: Send 100-continue header if possible

See: 17dc39e76baf8a481fc8b1d24ee4cf7a6ffe1c1d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoIcecast: Send content-type in all cases
Marvin Scholz [Tue, 11 Nov 2014 01:39:40 +0000 (02:39 +0100)]
Icecast: Send content-type in all cases

This is needed because Icecast since version 2.4.1 doesn't default
to audio/mpeg anymore. AVOption default not used here, since a later
check if -content_type is set is performed and would break.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoIcecast: Send 100-continue header if possible
Marvin Scholz [Tue, 11 Nov 2014 01:39:39 +0000 (02:39 +0100)]
Icecast: Send 100-continue header if possible

This allows for proper error reporting. Only do
this for non-legacy requests as only Icecast >2.4.0
will reply with a proper status.
Libav seems to accept both, 100 and 200 status codes, but
let's stay close to spec.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoavfilter/x86/vf_interlace: rewrite asm
Michael Niedermayer [Sat, 15 Nov 2014 03:07:08 +0000 (04:07 +0100)]
avfilter/x86/vf_interlace: rewrite asm

4775 decicycles -> 3688 decicycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/tinterlace: add Support for ff_lowpass_line_avx() & ff_lowpass_line_sse2()
Michael Niedermayer [Sat, 15 Nov 2014 02:49:37 +0000 (03:49 +0100)]
avfilter/tinterlace: add Support for ff_lowpass_line_avx() & ff_lowpass_line_sse2()

Based-on: 2e1704059ae8625beda2ffde847ad22c5ba416dc by Kieran Kunhya

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/tinterlace: Move lowpass_line to a separate function and call it through...
Michael Niedermayer [Sat, 15 Nov 2014 02:20:02 +0000 (03:20 +0100)]
avfilter/tinterlace: Move lowpass_line to a separate function and call it through a function pointer

This permits replacing it by a optimized implementation
Based-on / Idea-from: 2e1704059ae8625beda2ffde847ad22c5ba416dc by Kieran Kunhya

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/tinterlace: split context definition into seperate header so it can be used...
Michael Niedermayer [Sat, 15 Nov 2014 02:09:28 +0000 (03:09 +0100)]
avfilter/tinterlace: split context definition into seperate header so it can be used by future optimizations

Idea from 2e1704059ae8625beda2ffde847ad22c5ba416dc from Kieran Kunhya

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_tinterlace: fix linesize vs. width
Michael Niedermayer [Wed, 12 Nov 2014 03:48:24 +0000 (04:48 +0100)]
avfilter/vf_tinterlace: fix linesize vs. width

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavformat/mxfdec.c: refactored resolving timecode component
Mark Reid [Wed, 12 Nov 2014 20:15:21 +0000 (12:15 -0800)]
libavformat/mxfdec.c: refactored resolving timecode component

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_tinterlace: Fix output top field first flag for MODE_INTERLACEX2
Michael Niedermayer [Thu, 13 Nov 2014 23:04:51 +0000 (00:04 +0100)]
avfilter/vf_tinterlace: Fix output top field first flag for MODE_INTERLACEX2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2e1704059ae8625beda2ffde847ad22c5ba416dc'
Michael Niedermayer [Sat, 15 Nov 2014 01:28:23 +0000 (02:28 +0100)]
Merge commit '2e1704059ae8625beda2ffde847ad22c5ba416dc'

* commit '2e1704059ae8625beda2ffde847ad22c5ba416dc':
  vf_interlace: Add SIMD for lowpass filter

Conflicts:
libavfilter/vf_interlace.c
libavfilter/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd16ec1b6db25bc348b0d4800c9a0c9b7070e3710'
Michael Niedermayer [Sat, 15 Nov 2014 01:14:03 +0000 (02:14 +0100)]
Merge commit 'd16ec1b6db25bc348b0d4800c9a0c9b7070e3710'

* commit 'd16ec1b6db25bc348b0d4800c9a0c9b7070e3710':
  atrac3plus: always initialize refwaves

The initialization is not needed, the array is never read before
being written to. Its merged anyway for robustness in respect to
future changes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/lpc: remove unneeded {}
Michael Niedermayer [Sat, 15 Nov 2014 01:08:20 +0000 (02:08 +0100)]
avcodec/lpc: remove unneeded {}

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '60e0ee7ca25bd3bea54043b0607efe4cd51acaf3'
Michael Niedermayer [Sat, 15 Nov 2014 01:00:46 +0000 (02:00 +0100)]
Merge commit '60e0ee7ca25bd3bea54043b0607efe4cd51acaf3'

* commit '60e0ee7ca25bd3bea54043b0607efe4cd51acaf3':
  lpc: always initialize ref and err

The initialization is not needed, its merged anyway as it might
help suppressing warnings and might make the code more robust against
future changes

See: c4a36b6f70f37e668874d134f955eb96e23853c9
See: 0dd99628ea15f1fe7121b8a983c0b1fe57660027
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3a6ddfb8745e4b306a5637927fb057f630345e2f'
Michael Niedermayer [Sat, 15 Nov 2014 00:54:32 +0000 (01:54 +0100)]
Merge commit '3a6ddfb8745e4b306a5637927fb057f630345e2f'

* commit '3a6ddfb8745e4b306a5637927fb057f630345e2f':
  exr: check return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e4cb6abb2f46910c72178e2f987a0198f0fd10b1'
Michael Niedermayer [Sat, 15 Nov 2014 00:52:49 +0000 (01:52 +0100)]
Merge commit 'e4cb6abb2f46910c72178e2f987a0198f0fd10b1'

* commit 'e4cb6abb2f46910c72178e2f987a0198f0fd10b1':
  bgmc: fix sizeof arguments

See: 41bf943f709e7327601f5aa02599fdcb3c1ca59d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4b39cc1a093c239412ded522c4a899744e7f2008'
Michael Niedermayer [Sat, 15 Nov 2014 00:45:32 +0000 (01:45 +0100)]
Merge commit '4b39cc1a093c239412ded522c4a899744e7f2008'

* commit '4b39cc1a093c239412ded522c4a899744e7f2008':
  riff: support ProRes in avi (APCN fourcc)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovf_interlace: Add SIMD for lowpass filter
Kieran Kunhya [Tue, 11 Nov 2014 18:43:42 +0000 (18:43 +0000)]
vf_interlace: Add SIMD for lowpass filter

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoatrac3plus: always initialize refwaves
Vittorio Giovara [Wed, 12 Nov 2014 18:10:46 +0000 (19:10 +0100)]
atrac3plus: always initialize refwaves

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

5 years agolpc: always initialize ref and err
Vittorio Giovara [Wed, 12 Nov 2014 18:10:47 +0000 (19:10 +0100)]
lpc: always initialize ref and err

CC: libav-stable@libav.org
Bug-Id: CID 29585 / CID 700759

5 years agoexr: check return value
Vittorio Giovara [Wed, 12 Nov 2014 18:10:45 +0000 (19:10 +0100)]
exr: check return value

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

5 years agobgmc: fix sizeof arguments
Thilo Borgmann [Wed, 12 Nov 2014 18:10:43 +0000 (19:10 +0100)]
bgmc: fix sizeof arguments

CC: libav-devel@libav.org
Bug-Id: CID 608084 / CID 700724

5 years agoriff: support ProRes in avi (APCN fourcc)
Vittorio Giovara [Fri, 14 Nov 2014 13:39:18 +0000 (14:39 +0100)]
riff: support ProRes in avi (APCN fourcc)

5 years agodoc/indevs: Rework and update documentation of AVFoundation device.
Thilo Borgmann [Thu, 13 Nov 2014 16:25:02 +0000 (17:25 +0100)]
doc/indevs: Rework and update documentation of AVFoundation device.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoChangelog: Mention AVFoundation screen capturing.
Thilo Borgmann [Thu, 13 Nov 2014 16:24:14 +0000 (17:24 +0100)]
Changelog: Mention AVFoundation screen capturing.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/avfoundation: Introduce device alias 'none' to allow the user to record only...
Thilo Borgmann [Thu, 13 Nov 2014 16:22:48 +0000 (17:22 +0100)]
lavd/avfoundation: Introduce device alias 'none' to allow the user to record only audio or video.

Changes the selection of a default device to none instead of the system default device.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotests/Makefile: Fix path for creation of ffprobe-test.nut.
Carl Eugen Hoyos [Fri, 14 Nov 2014 16:30:16 +0000 (17:30 +0100)]
tests/Makefile: Fix path for creation of ffprobe-test.nut.

5 years agoavcodec/pngdec: split frame decoding in its own function.
Benoit Fouet [Fri, 14 Nov 2014 09:17:39 +0000 (10:17 +0100)]
avcodec/pngdec: split frame decoding in its own function.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: create a function to handle small (<=4) bits per pixel values.
Benoit Fouet [Fri, 14 Nov 2014 09:17:38 +0000 (10:17 +0100)]
avcodec/pngdec: create a function to handle small (<=4) bits per pixel values.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: use else if instead of if for small bpp handling.
Benoit Fouet [Fri, 14 Nov 2014 09:17:37 +0000 (10:17 +0100)]
avcodec/pngdec: use else if instead of if for small bpp handling.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: fix some indentation/whitespaces
Benoit Fouet [Fri, 14 Nov 2014 09:17:36 +0000 (10:17 +0100)]
avcodec/pngdec: fix some indentation/whitespaces

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: create a function to decode tRNS chunk.
Benoit Fouet [Fri, 14 Nov 2014 09:17:35 +0000 (10:17 +0100)]
avcodec/pngdec: create a function to decode tRNS chunk.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: create a function to decode PLTE chunk.
Benoit Fouet [Fri, 14 Nov 2014 09:17:34 +0000 (10:17 +0100)]
avcodec/pngdec: create a function to decode PLTE chunk.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: create a function to decode IDAT chunk.
Benoit Fouet [Fri, 14 Nov 2014 09:17:33 +0000 (10:17 +0100)]
avcodec/pngdec: create a function to decode IDAT chunk.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: create a function to decode pHYs chunk.
Benoit Fouet [Fri, 14 Nov 2014 09:17:32 +0000 (10:17 +0100)]
avcodec/pngdec: create a function to decode pHYs chunk.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: create a function to decode IHDR chunk.
Benoit Fouet [Fri, 14 Nov 2014 09:17:31 +0000 (10:17 +0100)]
avcodec/pngdec: create a function to decode IHDR chunk.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: rename decode_frame to decode_frame_png
Benoit Fouet [Fri, 14 Nov 2014 09:17:30 +0000 (10:17 +0100)]
avcodec/pngdec: rename decode_frame to decode_frame_png

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_lut: gammaval709()
Peter Ross [Thu, 13 Nov 2014 22:14:24 +0000 (09:14 +1100)]
avfilter/vf_lut: gammaval709()

See http://www.itu.int/rec/R-REC-BT.709
Item 1.2, overall opto-electronic transfer characteristics at source

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: add xBR filter tests
Clément Bœsch [Mon, 10 Nov 2014 05:43:15 +0000 (06:43 +0100)]
fate: add xBR filter tests

5 years agoavfilter/vf_tinterlace: fix frame rate
Aleksey Vasenev [Wed, 12 Nov 2014 22:39:45 +0000 (01:39 +0300)]
avfilter/vf_tinterlace: fix frame rate

Signed-off-by: Aleksey Vasenev <margtu-fivt@ya.ru>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_interlace: more accurate pts calculation
Aleksey Vasenev [Wed, 12 Nov 2014 22:38:29 +0000 (01:38 +0300)]
avfilter/vf_interlace: more accurate pts calculation

Signed-off-by: Aleksey Vasenev <margtu-fivt@ya.ru>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc/flashsv2enc: Fix encoding resolution error message.
Carl Eugen Hoyos [Thu, 13 Nov 2014 21:13:33 +0000 (22:13 +0100)]
lavc/flashsv2enc: Fix encoding resolution error message.

5 years agoavcodec/nellymoserenc: fix sign error
Michael Niedermayer [Thu, 13 Nov 2014 19:40:37 +0000 (20:40 +0100)]
avcodec/nellymoserenc: fix sign error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/4xm: remove duplicate assert
Michael Niedermayer [Thu, 13 Nov 2014 18:01:08 +0000 (19:01 +0100)]
avcodec/4xm: remove duplicate assert

Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotests/tiny_psnr: remove redundant initialization
Michael Niedermayer [Thu, 13 Nov 2014 15:03:23 +0000 (16:03 +0100)]
tests/tiny_psnr: remove redundant initialization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/flacdsp: add SSE2 and AVX decorrelate functions
James Almer [Thu, 13 Nov 2014 16:47:55 +0000 (13:47 -0300)]
x86/flacdsp: add SSE2 and AVX decorrelate functions

Two to four times faster depending on instruction set, block size and channel count.

5 years agocinedec: report white balance gain coefficients using metadata
Peter Ross [Sun, 9 Nov 2014 01:05:41 +0000 (12:05 +1100)]
cinedec: report white balance gain coefficients using metadata

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a2448cfe167a4cd4eb631318550d4eef38fca24a'
Michael Niedermayer [Thu, 13 Nov 2014 14:20:40 +0000 (15:20 +0100)]
Merge commit 'a2448cfe167a4cd4eb631318550d4eef38fca24a'

* commit 'a2448cfe167a4cd4eb631318550d4eef38fca24a':
  jpeg2000: do not compute the same value twice

Conflicts:
libavcodec/jpeg2000.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '59846452af762f6af5ced4399e8dcd709ca50fcd'
Michael Niedermayer [Thu, 13 Nov 2014 13:53:14 +0000 (14:53 +0100)]
Merge commit '59846452af762f6af5ced4399e8dcd709ca50fcd'

* commit '59846452af762f6af5ced4399e8dcd709ca50fcd':
  svq1enc: check ff_get_buffer return value

Conflicts:
libavcodec/svq1enc.c

See: 7effc26ba74717bb9c808d96791c7cf98911d1a1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '994ab1804b8bf532f44876927b07b51f1f63247f'
Michael Niedermayer [Thu, 13 Nov 2014 13:51:16 +0000 (14:51 +0100)]
Merge commit '994ab1804b8bf532f44876927b07b51f1f63247f'

* commit '994ab1804b8bf532f44876927b07b51f1f63247f':
  ansi: check ff_set_dimensions return value

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

* commit 'c7384664ba0cbb12d882effafbc6d321ae706cff':
  avs: check ff_set_dimensions return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2b5c1efa1465d8646f8be525cace7a21404e40ad'
Michael Niedermayer [Thu, 13 Nov 2014 13:31:14 +0000 (14:31 +0100)]
Merge commit '2b5c1efa1465d8646f8be525cace7a21404e40ad'

* commit '2b5c1efa1465d8646f8be525cace7a21404e40ad':
  g2meet: check ff_set_dimensions return value

Conflicts:
libavcodec/g2meet.c

See: 3af9d8269ea2878fb7960ab5ed52f4a75c73e6ec
Merged-by: Michael Niedermayer <michaelni@gmx.at>