ffmpeg.git
5 years agoavfilter/vf_lenscorrection: get rid of floats in init code
Michael Niedermayer [Wed, 20 Aug 2014 12:15:12 +0000 (14:15 +0200)]
avfilter/vf_lenscorrection: get rid of floats in init code

The only remaining floats are in the user interface, they are left as they
should not cause a problem in practice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_lenscorrection: get rid of all floats per frame
Michael Niedermayer [Wed, 20 Aug 2014 12:05:20 +0000 (14:05 +0200)]
avfilter/vf_lenscorrection: get rid of all floats per frame

there are some still left for 1 time initialization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_lenscorrection: get rid of some floats
Michael Niedermayer [Wed, 20 Aug 2014 11:19:26 +0000 (13:19 +0200)]
avfilter/vf_lenscorrection: get rid of some floats

5 years agofate: add test for old (v1) huffyuv and rgba
Christophe Gisquet [Wed, 20 Aug 2014 23:19:47 +0000 (23:19 +0000)]
fate: add test for old (v1) huffyuv and rgba

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohuffyuvdec: fix old (v1) rgba
Christophe Gisquet [Wed, 20 Aug 2014 23:19:48 +0000 (23:19 +0000)]
huffyuvdec: fix old (v1) rgba

Commit deadcf5e misplaced a hunk.

Fixes ticket #3877.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/showwaves: align const mode values (cosmetics)
Clément Bœsch [Wed, 20 Aug 2014 20:32:06 +0000 (22:32 +0200)]
avfilter/showwaves: align const mode values (cosmetics)

5 years agodoc/filters: fix cline option name recently added
Clément Bœsch [Wed, 20 Aug 2014 20:30:38 +0000 (22:30 +0200)]
doc/filters: fix cline option name recently added

5 years agoavfilter/showwaves: add split_channels option
Clément Bœsch [Thu, 26 Dec 2013 12:39:49 +0000 (13:39 +0100)]
avfilter/showwaves: add split_channels option

5 years agoavfilter/showwaves: split out draw sample code
Clément Bœsch [Thu, 26 Dec 2013 11:57:20 +0000 (12:57 +0100)]
avfilter/showwaves: split out draw sample code

5 years agoavfilter/showwaves: add "cline" mode (centered line)
Clément Bœsch [Thu, 26 Dec 2013 11:08:24 +0000 (12:08 +0100)]
avfilter/showwaves: add "cline" mode (centered line)

5 years agox86/hecv_res_add: add ff_hevc_transform_add{8,16,32}_8_avx
James Almer [Wed, 20 Aug 2014 02:52:05 +0000 (23:52 -0300)]
x86/hecv_res_add: add ff_hevc_transform_add{8,16,32}_8_avx

~15% faster than sse2

Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agodoc/ffmpeg: fix metadata language example
Lou Logan [Tue, 19 Aug 2014 23:16:20 +0000 (15:16 -0800)]
doc/ffmpeg: fix metadata language example

Signed-off-by: Lou Logan <lou@lrcd.com>
5 years agoavfilter/avf_showspectrum: fix colums typo
Michael Niedermayer [Wed, 20 Aug 2014 16:49:01 +0000 (18:49 +0200)]
avfilter/avf_showspectrum: fix colums typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/asfdec: Check av_new_packet()s return code
Michael Niedermayer [Wed, 20 Aug 2014 16:27:25 +0000 (18:27 +0200)]
avformat/asfdec: Check av_new_packet()s return code

Fixes CID1041093

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/nutdec: always initialize event_flags
Michael Niedermayer [Wed, 20 Aug 2014 14:45:08 +0000 (16:45 +0200)]
avformat/nutdec: always initialize event_flags

Fixes: CID1231990

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc_ps: do cleanup in case of unsupported bit depth
Michael Niedermayer [Wed, 20 Aug 2014 01:38:30 +0000 (03:38 +0200)]
avcodec/hevc_ps: do cleanup in case of unsupported bit depth

Fixes memleak
Fixes CID1231989

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavfi/apad: fix if_( style
Stefano Sabatini [Mon, 18 Aug 2014 12:52:38 +0000 (14:52 +0200)]
lavfi/apad: fix if_( style

5 years agox86/hevc_res_add: fix register count in hevc_transform_add{16,32}_10_avx2
James Almer [Wed, 20 Aug 2014 00:30:55 +0000 (21:30 -0300)]
x86/hevc_res_add: fix register count in hevc_transform_add{16,32}_10_avx2

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agox86: hevc: adding transform_add
Pierre Edouard Lepere [Mon, 18 Aug 2014 08:01:09 +0000 (10:01 +0200)]
x86: hevc: adding transform_add

Reviewed-by: James Almer <jamrial@gmail.com>
Approved-by: Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '67a7695c142561fe60f21adffe89c133385d37c9'
Michael Niedermayer [Tue, 19 Aug 2014 22:23:15 +0000 (00:23 +0200)]
Merge commit '67a7695c142561fe60f21adffe89c133385d37c9'

* commit '67a7695c142561fe60f21adffe89c133385d37c9':
  avfilter: Remove unused variable from ff_get_video_buffer()

Conflicts:
libavfilter/video.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc/tiff: add support for YUV deflate
James Almer [Tue, 19 Aug 2014 20:33:40 +0000 (17:33 -0300)]
lavc/tiff: add support for YUV deflate

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agolavc/tiff: move unpack_yuv() above the deflate functions
James Almer [Tue, 19 Aug 2014 20:04:01 +0000 (17:04 -0300)]
lavc/tiff: move unpack_yuv() above the deflate functions

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavcodec/adpcm: Fix incorrect AVSampleFormat for sample_fmts_s16p
Jon Morley [Tue, 19 Aug 2014 18:17:49 +0000 (11:17 -0700)]
avcodec/adpcm: Fix incorrect AVSampleFormat for sample_fmts_s16p

The AVSampleFormat list of sample_fmts_s16p is missing the trailing "P" for planar formats. AV_SAMPLE_FMT_S16 vs AV_SAMPLE_FMT_S16P

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/tiff: Check that pix_fmt is a yuv variant for TIFF_PHOTOMETRIC_YCBCR
Michael Niedermayer [Tue, 19 Aug 2014 19:08:34 +0000 (21:08 +0200)]
avcodec/tiff: Check that pix_fmt is a yuv variant for TIFF_PHOTOMETRIC_YCBCR

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/tiff: do not use photometric to detect pix_fmt
Michael Niedermayer [Tue, 19 Aug 2014 18:57:42 +0000 (20:57 +0200)]
avcodec/tiff: do not use photometric to detect pix_fmt

They should match but they do not always
Fixes assertion failure
no testcase with unmodified source available

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoalign and correct messages regarding bitstream filters
Moritz Barsnick [Tue, 19 Aug 2014 12:28:35 +0000 (14:28 +0200)]
align and correct messages regarding bitstream filters

The messages regarding the recommended use of bitstream filters are somewhat different.
This also adds the ":v" stream specifier to "-bsf h264_mp4toannexb".

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b977b287f61fea48ecd6251d54a26334213b7ec6'
Michael Niedermayer [Tue, 19 Aug 2014 17:58:17 +0000 (19:58 +0200)]
Merge commit 'b977b287f61fea48ecd6251d54a26334213b7ec6'

* commit 'b977b287f61fea48ecd6251d54a26334213b7ec6':
  vsrc_movie: Avoid a variable indirection in movie_get_frame()

Conflicts:
libavfilter/src_movie.c

no change as theres no such code in src_movie.c in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6af2930222ee5d8ce19f3b999a78d85a3c457391'
Michael Niedermayer [Tue, 19 Aug 2014 17:13:49 +0000 (19:13 +0200)]
Merge commit '6af2930222ee5d8ce19f3b999a78d85a3c457391'

* commit '6af2930222ee5d8ce19f3b999a78d85a3c457391':
  pcm: Drop av_unused attribute from variable that is always used

Conflicts:
libavcodec/pcm.c

No change as there is no such av_unused variable in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '14d2006ca6c0e2b54784b93560f09e0e19c0a270'
Michael Niedermayer [Tue, 19 Aug 2014 17:11:58 +0000 (19:11 +0200)]
Merge commit '14d2006ca6c0e2b54784b93560f09e0e19c0a270'

* commit '14d2006ca6c0e2b54784b93560f09e0e19c0a270':
  pcm: Drop unused variable from DECODE_PLANAR macro

Conflicts:
libavcodec/pcm.c

No change as the changed code isnt in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter: Remove unused variable from ff_get_video_buffer()
Diego Biurrun [Fri, 15 Aug 2014 20:13:09 +0000 (22:13 +0200)]
avfilter: Remove unused variable from ff_get_video_buffer()

5 years agoMerge commit 'd456baafb68cd80c0f537f1d843076e4dd853558'
Michael Niedermayer [Tue, 19 Aug 2014 16:43:42 +0000 (18:43 +0200)]
Merge commit 'd456baafb68cd80c0f537f1d843076e4dd853558'

* commit 'd456baafb68cd80c0f537f1d843076e4dd853558':
  vc1: Add missing parentheses to conditions in vc1_decode_b_mb_intfr()

Conflicts:
libavcodec/vc1dec.c

See: 1e2ab98460761c86268993e7a7ee690876df5efd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2'
Michael Niedermayer [Tue, 19 Aug 2014 16:33:46 +0000 (18:33 +0200)]
Merge commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2'

* commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2':
  vfwcap: Drop fallback VfW defines

Conflicts:
libavdevice/vfwcap.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '86dfcfd0e30d6645eea2c63c1c60a0550e7c97ea'
Michael Niedermayer [Tue, 19 Aug 2014 16:27:46 +0000 (18:27 +0200)]
Merge commit '86dfcfd0e30d6645eea2c63c1c60a0550e7c97ea'

* commit '86dfcfd0e30d6645eea2c63c1c60a0550e7c97ea':
  mov: Drop unused parameter from ff_mov_read_esds()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agowavpackenc: proper buffer allocation
Christophe Gisquet [Tue, 19 Aug 2014 12:26:49 +0000 (12:26 +0000)]
wavpackenc: proper buffer allocation

The allocation didn't account for headers, that can be easily 79 bytes.
As a result, buffers allocated for a few samples (e.g. 5 in the original
bug) could be undersized.

Fixed ticket #2881.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agowavpack: report if there is no bits left
Christophe Gisquet [Tue, 19 Aug 2014 12:26:47 +0000 (12:26 +0000)]
wavpack: report if there is no bits left

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agogdigrab: fix gdi object leak if using mouse
rogerdpack [Tue, 19 Aug 2014 13:42:18 +0000 (07:42 -0600)]
gdigrab: fix gdi object leak if using mouse

based on patch from hlszl1983@163.com

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pafaudio: use paf.h instead
Paul B Mahol [Tue, 19 Aug 2014 13:35:44 +0000 (13:35 +0000)]
avcodec/pafaudio: use paf.h instead

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/pafvideo: remove unused header
Paul B Mahol [Tue, 19 Aug 2014 13:35:02 +0000 (13:35 +0000)]
avcodec/pafvideo: remove unused header

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agovsrc_movie: Avoid a variable indirection in movie_get_frame()
Diego Biurrun [Fri, 15 Aug 2014 20:13:14 +0000 (22:13 +0200)]
vsrc_movie: Avoid a variable indirection in movie_get_frame()

This avoids an unused variable warning with MSVC since the variable is
only used in a debug mode printf statement.

5 years agopcm: Drop av_unused attribute from variable that is always used
Diego Biurrun [Fri, 15 Aug 2014 20:13:11 +0000 (22:13 +0200)]
pcm: Drop av_unused attribute from variable that is always used

5 years agopcm: Drop unused variable from DECODE_PLANAR macro
Diego Biurrun [Fri, 15 Aug 2014 20:13:10 +0000 (22:13 +0200)]
pcm: Drop unused variable from DECODE_PLANAR macro

5 years agovc1: Add missing parentheses to conditions in vc1_decode_b_mb_intfr()
Diego Biurrun [Fri, 15 Aug 2014 20:13:08 +0000 (22:13 +0200)]
vc1: Add missing parentheses to conditions in vc1_decode_b_mb_intfr()

5 years agovfwcap: Drop fallback VfW defines
Diego Biurrun [Fri, 15 Aug 2014 20:13:06 +0000 (22:13 +0200)]
vfwcap: Drop fallback VfW defines

The defines were added long ago when MinGW still lacked them.

5 years agomov: Drop unused parameter from ff_mov_read_esds()
Diego Biurrun [Fri, 15 Aug 2014 20:13:03 +0000 (22:13 +0200)]
mov: Drop unused parameter from ff_mov_read_esds()

This is cleaner and avoids an uninitialized variable warning with MSVC.

5 years agoavcodec/proresenc_kostya: allocate 1 slice more to avoid triggering the reallocation...
Michael Niedermayer [Mon, 18 Aug 2014 19:29:32 +0000 (21:29 +0200)]
avcodec/proresenc_kostya: allocate 1 slice more to avoid triggering the reallocation warning when the used space is actually less than the allocated

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/proresenc_kostya: set initial max_slice_size based on frame_size_upper_bound
Michael Niedermayer [Mon, 18 Aug 2014 18:42:27 +0000 (20:42 +0200)]
avcodec/proresenc_kostya: set initial max_slice_size based on frame_size_upper_bound

If the initial max_slice_size is 0 then reallocation is disabled for the first
slice.

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohuffyuvenc: add a non-deterministic option
Christophe Gisquet [Thu, 12 Jun 2014 22:21:44 +0000 (00:21 +0200)]
huffyuvenc: add a non-deterministic option

Not actually used in huffyuvenc, but rather in setting the frame
threading.

Example for some files:
context=0:       851974   27226   1137281
context=1,ND=0:  471819   22604    972351
context=1,ND=1:  472875   22673    972582

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/atempo: Flush all buffered input samples
Pavel Koshevoy [Tue, 19 Aug 2014 06:17:59 +0000 (00:17 -0600)]
avfilter/atempo: Flush all buffered input samples

Fixes ticket #3829

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/cinedec: allow number zero in metadata
Ben Hagen [Mon, 18 Aug 2014 23:15:23 +0000 (01:15 +0200)]
avformat/cinedec: allow number zero in metadata

5 years agolavu/log: add device category macros
Lukasz Marek [Wed, 6 Aug 2014 23:58:56 +0000 (01:58 +0200)]
lavu/log: add device category macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/pulse_audio_dec: use default source when no input provided
Lukasz Marek [Wed, 6 Aug 2014 23:58:55 +0000 (01:58 +0200)]
lavd/pulse_audio_dec: use default source when no input provided

PulseAudio expilitly requires name of the source.
This patch makes it use default source when not provided.
It simplifies programistic use.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoalac: add option to decoded incorrect ALAC
Christophe Gisquet [Mon, 18 Aug 2014 07:53:20 +0000 (09:53 +0200)]
alac: add option to decoded incorrect ALAC

Prior to 56.1.100, incorrect ALAC files for 24bps content were produced, in
particular not decoding losslessly.

Add an option to allow correctly decoding those streams.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '41e1354c101004ccd46dc08d3dd6e956e83a6b51'
Michael Niedermayer [Mon, 18 Aug 2014 18:27:41 +0000 (20:27 +0200)]
Merge commit '41e1354c101004ccd46dc08d3dd6e956e83a6b51'

* commit '41e1354c101004ccd46dc08d3dd6e956e83a6b51':
  proresenc: Properly account for alpha plane

Conflicts:
libavcodec/proresenc_kostya.c

See: 117bc8e6ffc744fedcf77edf2fdb33c964b83370
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '45ce880a9b3e50cfa088f111dffaf8685bd7bc6b'
Michael Niedermayer [Mon, 18 Aug 2014 18:20:12 +0000 (20:20 +0200)]
Merge commit '45ce880a9b3e50cfa088f111dffaf8685bd7bc6b'

* commit '45ce880a9b3e50cfa088f111dffaf8685bd7bc6b':
  proresenc: Realloc if buffer is too small

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '58b68e4fdea22e22178e237bda950b09cc6f363a'
Michael Niedermayer [Mon, 18 Aug 2014 18:11:31 +0000 (20:11 +0200)]
Merge commit '58b68e4fdea22e22178e237bda950b09cc6f363a'

* commit '58b68e4fdea22e22178e237bda950b09cc6f363a':
  proresenc: Report buffer overflow

Conflicts:
libavcodec/proresenc_kostya.c

See: 52b81ff4635c077b2bc8b8d3637d933b6629d803
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b16699f2da9c1d41eff852ec3a0c81f74fd44421'
Michael Niedermayer [Mon, 18 Aug 2014 18:01:14 +0000 (20:01 +0200)]
Merge commit 'b16699f2da9c1d41eff852ec3a0c81f74fd44421'

* commit 'b16699f2da9c1d41eff852ec3a0c81f74fd44421':
  proresenc: Remove unneeded parameters from encode_alpha_plane()

Conflicts:
libavcodec/proresenc_kostya.c

See: bf10f09bccdcfdb41b9f5bbae01d55961bfd0693
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '12640e4cbb142be0cd025bcf37f1ea437bdfecd0'
Michael Niedermayer [Mon, 18 Aug 2014 17:51:53 +0000 (19:51 +0200)]
Merge commit '12640e4cbb142be0cd025bcf37f1ea437bdfecd0'

* commit '12640e4cbb142be0cd025bcf37f1ea437bdfecd0':
  tiff: Return proper error for missing LZMA compression

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'dd35d451fbc34795a8d19ac6c281bed53c42a29b'
Michael Niedermayer [Mon, 18 Aug 2014 17:50:55 +0000 (19:50 +0200)]
Merge commit 'dd35d451fbc34795a8d19ac6c281bed53c42a29b'

* commit 'dd35d451fbc34795a8d19ac6c281bed53c42a29b':
  doc: Change wrong term to avoid confusion

Conflicts:
doc/developer.texi

No change, as the wrong term is not part of our docs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/a64: Avoid segfault in a64_write_header() when stream codec is not open
Andrey Myznikov [Mon, 18 Aug 2014 17:03:31 +0000 (20:03 +0300)]
avformat/a64: Avoid segfault in a64_write_header() when stream codec is not open

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoproresenc: Properly account for alpha plane
Christophe Gisquet [Mon, 18 Aug 2014 14:15:24 +0000 (14:15 +0000)]
proresenc: Properly account for alpha plane

The packet buffer allocation considers the alpha channel as DCT-coded,
while it is actually run-coded and thus requires a larger buffer.

CC: libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoproresenc: Realloc if buffer is too small
Christophe Gisquet [Mon, 18 Aug 2014 14:15:23 +0000 (14:15 +0000)]
proresenc: Realloc if buffer is too small

The buffer allocation may be incorrect (e.g. with an alpha plane),
and currently causes the buffer to be set to NULL by init_put_bits,
causing a crash later on.

So, detect that situation, and if detected, reallocate the buffer
and ask for a sample that shows the problem.

CC: libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoproresenc: Report buffer overflow
Christophe Gisquet [Mon, 18 Aug 2014 14:15:22 +0000 (14:15 +0000)]
proresenc: Report buffer overflow

If the allocated size, despite best efforts, is too small, exit
with the appropriate error.

CC: libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoproresenc: Remove unneeded parameters from encode_alpha_plane()
Christophe Gisquet [Mon, 18 Aug 2014 14:15:21 +0000 (14:15 +0000)]
proresenc: Remove unneeded parameters from encode_alpha_plane()

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavformat/iff: rudimentary support for animations
Paul B Mahol [Mon, 18 Aug 2014 13:36:05 +0000 (13:36 +0000)]
avformat/iff: rudimentary support for animations

For now only first frame is decoded.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agotiff: Return proper error for missing LZMA compression
Diego Elio Pettenò [Mon, 18 Aug 2014 08:27:49 +0000 (09:27 +0100)]
tiff: Return proper error for missing LZMA compression

The LZMA support is a semi-official extension supported by libtiff 4.0.0
and later.

Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavcodec: export motion vectors in frame side data on demand
Clément Bœsch [Wed, 16 Jul 2014 14:42:42 +0000 (16:42 +0200)]
avcodec: export motion vectors in frame side data on demand

The reasoning behind this addition is that various third party
applications are interested in getting some motion information out of a
video "for free" when it is available.

It was considered to export other information as well (such as the intra
information about the block, or the quantization) but the structure
might have ended up into a half full-generic, half full of codec
specific cruft. If more information is necessary, it should either be
added in the "flags" field of the AVMotionVector structure, or in
another side-data.

This commit also includes an example exporting them in a CSV stream.

5 years agoavdevice/v4l2: try to fix build for openbsd
Michael Niedermayer [Mon, 18 Aug 2014 11:53:55 +0000 (13:53 +0200)]
avdevice/v4l2: try to fix build for openbsd

Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agowvdec: check for eof in wv_read_block_header()
Paul B Mahol [Mon, 18 Aug 2014 11:00:24 +0000 (11:00 +0000)]
wvdec: check for eof in wv_read_block_header()

Fixes Ticket #3865
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agodoc: Change wrong term to avoid confusion
Gabriel Dume [Sun, 17 Aug 2014 20:19:38 +0000 (16:19 -0400)]
doc: Change wrong term to avoid confusion

A function declaration is the prototype.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agocafdec: check for eof in read_info_chunk()
Paul B Mahol [Mon, 18 Aug 2014 10:32:57 +0000 (10:32 +0000)]
cafdec: check for eof in read_info_chunk()

Fixes Ticket #3864
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoMerge commit '42604902292ebaba39b13e8efd98419908518019'
Michael Niedermayer [Mon, 18 Aug 2014 08:24:23 +0000 (10:24 +0200)]
Merge commit '42604902292ebaba39b13e8efd98419908518019'

* commit '42604902292ebaba39b13e8efd98419908518019':
  Prepare for 11_beta1 Release

Conflicts:
RELEASE

No change, not merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agogifdec: use truncated width for image manipulation
Christophe Gisquet [Sun, 17 Aug 2014 07:47:46 +0000 (09:47 +0200)]
gifdec: use truncated width for image manipulation

Some files seem to have an off-by-one error. In most cases, it appears to
be on the image width. Therefore, if the decoded image doesn't fit in the
screen:
- If it is wider than the screen (and the lzw decoding buffer), reject it;
- Otherwise, decode the indicated amount, but only write a truncated amount
  to the screen.

Fixes ticket #3538.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/wavdec: add sanity check for AVCodecContext.channels
James Almer [Mon, 18 Aug 2014 06:14:01 +0000 (03:14 -0300)]
lavf/wavdec: add sanity check for AVCodecContext.channels

Fixes ticket #3862.
As a side effect, this also fixes aac_latm in wav.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/v4l2: do not fail when VIDIOC_ENUMSTD returns ENODATA
Andre Wolokita [Mon, 18 Aug 2014 07:09:22 +0000 (09:09 +0200)]
lavd/v4l2: do not fail when VIDIOC_ENUMSTD returns ENODATA

As of September 14 2012, v4l_enumstd() will return ENODATA
when a device's std field is set to 0. That is, the device
does not have a standard format. In order to properly
handle this case, v4l2_set_parameters should catch the
ENODATA code and break instead of failing.

Below is the v4l2-core commit describing this change.

>>commit a5338190efc7cfa8c99a6856342a77d21c9a05cf
>>Author: Hans Verkuil <hans.verkuil@cisco.com>
>>Date:   Fri Sep 14 06:45:43 2012 -0300
>>
>>    [media] v4l2-core: tvnorms may be 0 for a given input, handle that case
>>
>>    Currently the core code looks at tvnorms to see whether ENUMSTD
>>    or G_PARM should be enabled. This is not a good check for drivers
>>    that support the STD API on one input and the DV Timings API on another.
>>    In that case tvnorms may be 0.
>>    Instead check whether s_std is present (for ENUMSTD) or whether g_std or
>>    current_norm is present for g_parm.
>>    Also, in the enumstd core function return ENODATA if tvnorms is 0,
>>    because in that case the current input does not support the STD API
>>    and ENUMSTD should return ENODATA for that.
>>
>>    Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
>>    Reviewed-by: Sakari Ailus <sakari.ailus@iki.fi>
>>    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

5 years agoffserver: warn if config uses a system port
Reynaldo H. Verdejo Pinochet [Mon, 18 Aug 2014 00:16:27 +0000 (20:16 -0400)]
ffserver: warn if config uses a system port

Should be harmless as far as users know what they are doing
but an informative warning wont hurt. For details, refer to
http://tools.ietf.org/html/rfc6335

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agoffserver: deprecate Port and BindAddress options in favor of HTTPPort and HTTPBindAddress
Stefano Sabatini [Sat, 2 Aug 2014 14:40:53 +0000 (16:40 +0200)]
ffserver: deprecate Port and BindAddress options in favor of HTTPPort and HTTPBindAddress

The new option names are more explicit.

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agoPrepare for 11_beta1 Release
Reinhard Tartler [Mon, 18 Aug 2014 02:18:19 +0000 (22:18 -0400)]
Prepare for 11_beta1 Release

5 years agoalacenc: fix extra bits extraction
Christophe Gisquet [Sun, 17 Aug 2014 16:56:45 +0000 (18:56 +0200)]
alacenc: fix extra bits extraction

The raw coded bits are extracted prior to decorrelation, as is correctly
performed by the decoder, and not after.

Fixes ticket #2768.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoalacenc: increase predictor buffer
Christophe Gisquet [Sun, 17 Aug 2014 17:09:13 +0000 (17:09 +0000)]
alacenc: increase predictor buffer

This change is almost cosmetical only, and reduces the changes needed to
fix the 24bps case.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mxf: added ULs for demuxing avid media composer mxf files
Mark Reid [Sun, 17 Aug 2014 21:26:45 +0000 (14:26 -0700)]
avformat/mxf: added ULs for demuxing avid media composer mxf files

The AAF SDK refers to these ULs as Legacy. These ULs are the same as the
ones found in FFmbc's version of mxf.c and the ones found in libMXF
Fixes Ticket#1554, Ticket#3100 and Ticket#3450

5 years agoMerge commit '369380e1c4c6fc9b0d9ff04ec23d46b252ba7110'
Michael Niedermayer [Sun, 17 Aug 2014 21:00:27 +0000 (23:00 +0200)]
Merge commit '369380e1c4c6fc9b0d9ff04ec23d46b252ba7110'

* commit '369380e1c4c6fc9b0d9ff04ec23d46b252ba7110':
  mxf: Support AAC

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '747cd9560c2248ff2834f29cd2190646330e4676'
Michael Niedermayer [Sun, 17 Aug 2014 20:00:46 +0000 (22:00 +0200)]
Merge commit '747cd9560c2248ff2834f29cd2190646330e4676'

* commit '747cd9560c2248ff2834f29cd2190646330e4676':
  mxf: Add the UL for the MPEG2VideoDescriptor

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '304089aca7d238ae184e09993b5c737aa22e2c2c'
Michael Niedermayer [Sun, 17 Aug 2014 19:49:27 +0000 (21:49 +0200)]
Merge commit '304089aca7d238ae184e09993b5c737aa22e2c2c'

* commit '304089aca7d238ae184e09993b5c737aa22e2c2c':
  mxf: Add UID print helpers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '11db644a8e54f02e54d2eaad343a87fcb697c15e'
Michael Niedermayer [Sun, 17 Aug 2014 19:42:49 +0000 (21:42 +0200)]
Merge commit '11db644a8e54f02e54d2eaad343a87fcb697c15e'

* commit '11db644a8e54f02e54d2eaad343a87fcb697c15e':
  lavr: Update the planar check in ff_audio_convert

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '96ce6d6f119a16e489941c629a2805204322b717'
Michael Niedermayer [Sun, 17 Aug 2014 19:07:05 +0000 (21:07 +0200)]
Merge commit '96ce6d6f119a16e489941c629a2805204322b717'

* commit '96ce6d6f119a16e489941c629a2805204322b717':
  doc: Add more information in the README

Conflicts:
README.md

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Sun, 17 Aug 2014 18:40:47 +0000 (20:40 +0200)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavf/http: remove special case for cookies attributes.
  lavf/http: fix cookie parsing.

Reviewed-by: Ronald S. Bultje
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/http: remove special case for cookies attributes.
Nicolas George [Sun, 17 Aug 2014 12:24:20 +0000 (14:24 +0200)]
lavf/http: remove special case for cookies attributes.

With the previous change, unknown attributes are all ignored,
as specified by the RFC.

5 years agolavf/http: fix cookie parsing.
Nicolas George [Sun, 17 Aug 2014 12:09:45 +0000 (14:09 +0200)]
lavf/http: fix cookie parsing.

The current code would use any unknown attribute-value pair
as the cookie value.
RFC 6265 states that the first key-value pair is the actual
cookie, and the attribute-value pairs only start after.

With the current code:
Set-Cookie: test=good_value; path=/; dummy=42
gives this:
Cookie: dummy=42
instead of this with the new code:
Cookie: test=good_value

5 years agoavcodec/lcldec: fix decoding of YUV444 sample
Piotr Bandurski [Sun, 17 Aug 2014 16:17:13 +0000 (18:17 +0200)]
avcodec/lcldec: fix decoding of YUV444 sample

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomxf: Support AAC
Luca Barbato [Tue, 12 Aug 2014 16:58:52 +0000 (18:58 +0200)]
mxf: Support AAC

Update mxf_set_audio_pts to use the container-provided information.

The UL is marked as "to be changed in the future", but the current
samples in the wild do use it.

5 years agomxf: Add the UL for the MPEG2VideoDescriptor
Luca Barbato [Tue, 12 Aug 2014 17:02:41 +0000 (19:02 +0200)]
mxf: Add the UL for the MPEG2VideoDescriptor

5 years agomxf: Add UID print helpers
Luca Barbato [Tue, 12 Aug 2014 14:55:22 +0000 (16:55 +0200)]
mxf: Add UID print helpers

And use it to print non-parsed ULs.

5 years agolavr: Update the planar check in ff_audio_convert
Luca Barbato [Sun, 17 Aug 2014 13:28:03 +0000 (13:28 +0000)]
lavr: Update the planar check in ff_audio_convert

Leftover from fbc0b8659967ea54a8472b5f795270d38bb085dd.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavcodec/h264_mb: fix grayscale only decoding with weighted prediction
Michael Niedermayer [Sun, 17 Aug 2014 13:00:16 +0000 (15:00 +0200)]
avcodec/h264_mb: fix grayscale only decoding with weighted prediction

Fixes Ticket3412

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/rpza: fix +- error
Michael Niedermayer [Sun, 17 Aug 2014 12:30:32 +0000 (14:30 +0200)]
avcodec/rpza: fix +- error

Fixes Ticket3471

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovcodec/rpza: print mismatching size in case of error
Michael Niedermayer [Sun, 17 Aug 2014 12:30:06 +0000 (14:30 +0200)]
vcodec/rpza: print mismatching size in case of error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/movenchint: use av_freep() for safety
Michael Niedermayer [Sat, 16 Aug 2014 17:44:50 +0000 (19:44 +0200)]
avformat/movenchint: use av_freep() for safety

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffprobe: add -show_data_hash option.
Nicolas George [Mon, 21 Apr 2014 15:49:33 +0000 (17:49 +0200)]
ffprobe: add -show_data_hash option.

5 years agovidstabutils: fix indentation
Timothy Gu [Sun, 17 Aug 2014 00:47:14 +0000 (17:47 -0700)]
vidstabutils: fix indentation

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegts: Use differential score for analyze()
Michael Niedermayer [Sat, 16 Aug 2014 21:07:28 +0000 (23:07 +0200)]
avformat/mpegts: Use differential score for analyze()

This avoids high scores in random data that has a high 0x47 frequency

Fixes Ticket3844

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