ffmpeg.git
5 years agovidstabutils: improve documentation
Timothy Gu [Fri, 22 Aug 2014 02:12:10 +0000 (19:12 -0700)]
vidstabutils: improve documentation

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovidstab*: Remove accidentally exported av_2_vs_pixel_format()
Timothy Gu [Fri, 22 Aug 2014 02:12:09 +0000 (19:12 -0700)]
vidstab*: Remove accidentally exported av_2_vs_pixel_format()

Also correctly namespace other functions in vidstabutils, and decrease
difference from Libav.

Initial-patch-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3526ab891c28396ada8b58bf7647309bab30de1d'
Michael Niedermayer [Fri, 22 Aug 2014 19:55:00 +0000 (21:55 +0200)]
Merge commit '3526ab891c28396ada8b58bf7647309bab30de1d'

* commit '3526ab891c28396ada8b58bf7647309bab30de1d':
  qt-faststart: Undefine fseeko/ftello before defining them

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1019b7c4edff537499c4a6cb0d65abae04ce58f6'
Michael Niedermayer [Fri, 22 Aug 2014 19:49:00 +0000 (21:49 +0200)]
Merge commit '1019b7c4edff537499c4a6cb0d65abae04ce58f6'

* commit '1019b7c4edff537499c4a6cb0d65abae04ce58f6':
  os_support: Undefine lseek/stat/fstat before defining them

Conflicts:
libavformat/os_support.h

See: ef122ff5072463366c020157f0a27aad7e6610db
See: ed3c0fe85dd5c228e98126b18e50ffb617e77070
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd'
Michael Niedermayer [Fri, 22 Aug 2014 19:14:43 +0000 (21:14 +0200)]
Merge commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd'

* commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd':
  ogg: Provide aliases for Speex, Opus and audio-only ogg

Conflicts:
Changelog
libavformat/oggenc.c
libavformat/version.h

See: 2ccc6ff03acc3ca31db1aeb828c747d05b5cb6aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cb7b1a2dfb547ab78342a7a9d5cd729d77d90421'
Michael Niedermayer [Fri, 22 Aug 2014 18:59:49 +0000 (20:59 +0200)]
Merge commit 'cb7b1a2dfb547ab78342a7a9d5cd729d77d90421'

* commit 'cb7b1a2dfb547ab78342a7a9d5cd729d77d90421':
  electronicarts: set the framerate for TGQ/TQI

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136'
Michael Niedermayer [Fri, 22 Aug 2014 17:52:49 +0000 (19:52 +0200)]
Merge commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136'

* commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136':
  electronicarts: read the framerate for MAD

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agowavpackenc: reset trailer info on block encoding
Christophe Gisquet [Fri, 22 Aug 2014 09:31:45 +0000 (09:31 +0000)]
wavpackenc: reset trailer info on block encoding

In some cases, in particular if several blocks are needed because of
the channel layout (e.g. 2.1), the information used to write the
trailing bits terminating the sample data was not reset.

This would cause potential desync on the decoder, although decoded
samples were actually mostly fine.

Fixes ticket #3879.

5 years agowavpack: check number of channels
Christophe Gisquet [Fri, 22 Aug 2014 09:31:44 +0000 (09:31 +0000)]
wavpack: check number of channels

This means container and codec disagree. The codec is supposed to
know better so this could be an error instead.

5 years agoMerge commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b'
Michael Niedermayer [Fri, 22 Aug 2014 17:01:26 +0000 (19:01 +0200)]
Merge commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b'

* commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b':
  electronicarts: do not fail on zero-sized chunks

Conflicts:
libavformat/electronicarts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'dc4b2e7d33903a6b9380e8a84b22b3a20facbb08'
Michael Niedermayer [Fri, 22 Aug 2014 16:49:22 +0000 (18:49 +0200)]
Merge commit 'dc4b2e7d33903a6b9380e8a84b22b3a20facbb08'

* commit 'dc4b2e7d33903a6b9380e8a84b22b3a20facbb08':
  rv34: use ff_mpeg_update_thread_context only when decoder is fully initialized

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b0bfd09f88da8b7c7666faf0ac7d5e74559dba9f'
Michael Niedermayer [Fri, 22 Aug 2014 16:43:26 +0000 (18:43 +0200)]
Merge commit 'b0bfd09f88da8b7c7666faf0ac7d5e74559dba9f'

* commit 'b0bfd09f88da8b7c7666faf0ac7d5e74559dba9f':
  configure: Suppress "potentially uninitialized variable" warnings from MSVC

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoqt-faststart: Undefine fseeko/ftello before defining them
Diego Biurrun [Fri, 15 Aug 2014 19:43:48 +0000 (21:43 +0200)]
qt-faststart: Undefine fseeko/ftello before defining them

This avoids a number of redefinition warnings on MinGW64.

5 years agoos_support: Undefine lseek/stat/fstat before defining them
Diego Biurrun [Fri, 15 Aug 2014 19:42:56 +0000 (21:42 +0200)]
os_support: Undefine lseek/stat/fstat before defining them

This avoids a number of redefinition warnings on MinGW64.

5 years agox86: hevcdsp: use compilation-time-fixed constant
Christophe Gisquet [Mon, 28 Jul 2014 17:17:28 +0000 (17:17 +0000)]
x86: hevcdsp: use compilation-time-fixed constant

The stride for some buffers is known.

Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevcdsp: remove more instances of compile-time-fixed parameters
Christophe Gisquet [Mon, 28 Jul 2014 10:13:06 +0000 (12:13 +0200)]
hevcdsp: remove more instances of compile-time-fixed parameters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevcdsp: remove compilation-time-fixed parameter
Christophe Gisquet [Mon, 28 Jul 2014 17:17:26 +0000 (17:17 +0000)]
hevcdsp: remove compilation-time-fixed parameter

The dststride parameter is always MAX_PB_SIZE.

Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: move MAX_PB_SIZE declaration
Christophe Gisquet [Mon, 28 Jul 2014 17:17:25 +0000 (17:17 +0000)]
hevc: move MAX_PB_SIZE declaration

Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoogg: Provide aliases for Speex, Opus and audio-only ogg
Luca Barbato [Sun, 17 Aug 2014 18:55:37 +0000 (20:55 +0200)]
ogg: Provide aliases for Speex, Opus and audio-only ogg

Since they are aliases for ogg enabling any of them enables ogg as well.

5 years agox86: hevc_mc: assume 2nd source stride is 64
Christophe Gisquet [Mon, 28 Jul 2014 06:55:26 +0000 (08:55 +0200)]
x86: hevc_mc: assume 2nd source stride is 64

Reviewed-by: Mickaël Raulet <mraulet@gmail.com
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoelectronicarts: set the framerate for TGQ/TQI
Anton Khirnov [Wed, 20 Aug 2014 06:06:41 +0000 (06:06 +0000)]
electronicarts: set the framerate for TGQ/TQI

It is hardcoded to 15fps.

5 years agoelectronicarts: read the framerate for MAD
Anton Khirnov [Wed, 20 Aug 2014 05:52:44 +0000 (05:52 +0000)]
electronicarts: read the framerate for MAD

5 years agoelectronicarts: do not fail on zero-sized chunks
Anton Khirnov [Wed, 20 Aug 2014 05:40:53 +0000 (05:40 +0000)]
electronicarts: do not fail on zero-sized chunks

At least one FATE sample contains such chunks and happens to work simply
by accident (due to find_stream_info() swallowing the error).

CC: libav-stable@libav.org
5 years agorv34: use ff_mpeg_update_thread_context only when decoder is fully initialized
Janne Grunau [Thu, 21 Aug 2014 11:26:33 +0000 (13:26 +0200)]
rv34: use ff_mpeg_update_thread_context only when decoder is fully initialized

MpegEncContext based decoders are only fully initialized after the first
ff_thread_get_buffer() call. The RV30/40 decoders may fail before a frame
buffer was requested. ff_mpeg_update_thread_context() fails on half
initialized MpegEncContexts. Since this can only happen before a the
first frame was decoded there is no need to call
ff_mpeg_update_thread_context().

Based on patches by John Stebbins and tested by John Stebbins.

CC: libav-stable@libav.org
5 years agowavpackenc: make assert more thorough
Christophe Gisquet [Fri, 22 Aug 2014 09:31:43 +0000 (09:31 +0000)]
wavpackenc: make assert more thorough

It was only validating that normal data wasn't filling the buffer.
However, extra data may be written afterwards.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agowavpackenc: fix number of samples per block
Christophe Gisquet [Fri, 22 Aug 2014 09:31:42 +0000 (09:31 +0000)]
wavpackenc: fix number of samples per block

Currently, the encoder will try to reduce it down to 150000, but the
decoder will complain starting at 131072 (WV_MAX_SAMPLES). Therefore,
change the loop limit.

Fixes ticket #3881.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/fic: Check if a frame is available before using it
Michael Niedermayer [Thu, 14 Aug 2014 03:32:44 +0000 (05:32 +0200)]
avcodec/fic: Check if a frame is available before using it

Fixes null pointer dereference
Fixes: ficvf.avi
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: fix aac/ac3 parser bitstream buffer size
Michael Niedermayer [Thu, 21 Aug 2014 23:15:57 +0000 (01:15 +0200)]
avcodec: fix aac/ac3 parser bitstream buffer size

Buffers containing copies of the AAC and AC3 header bits were not padded
before parsing, violating init_get_bits() buffer padding requirement,
leading to potential buffer read overflows.
This change adds FF_INPUT_BUFFER_PADDING_SIZE bytes to the bit buffer
for parsing the header in each of aac_parser.c and ac3_parser.c.

Based on patch by: Matt Wolenetz <wolenetz@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodpxenc: fix padding in encode_gbrp12
Christophe Gisquet [Wed, 20 Aug 2014 08:10:44 +0000 (08:10 +0000)]
dpxenc: fix padding in encode_gbrp12

It was added per pixel instead of per line.

Reviewed-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc_ps: check overflow and test alternate syntax
Christophe Gisquet [Thu, 21 Aug 2014 16:57:18 +0000 (18:57 +0200)]
hevc_ps: check overflow and test alternate syntax

Some streams were found to have what appeared to be truncated SPS.
Their syntax seem to be valid at least until the end of the VUI, so
try that syntax if the parsing would overflow the SPS in the
conforming syntax.

Fixes ticket #3872.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9'
Michael Niedermayer [Thu, 21 Aug 2014 19:56:33 +0000 (21:56 +0200)]
Merge commit '13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9'

* commit '13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9':
  adts: Return more meaningful error codes

Conflicts:
libavformat/adtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '593aaee953f8b07c141ff115e67bae85ef0350c7'
Michael Niedermayer [Thu, 21 Aug 2014 19:47:43 +0000 (21:47 +0200)]
Merge commit '593aaee953f8b07c141ff115e67bae85ef0350c7'

* commit '593aaee953f8b07c141ff115e67bae85ef0350c7':
  setpts: Add missing inttypes.h #include for PRId64

Conflicts:
libavfilter/setpts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8fc6a70c2167b645b7a37d0cbc0e276e7b787cc9'
Michael Niedermayer [Thu, 21 Aug 2014 19:37:39 +0000 (21:37 +0200)]
Merge commit '8fc6a70c2167b645b7a37d0cbc0e276e7b787cc9'

* commit '8fc6a70c2167b645b7a37d0cbc0e276e7b787cc9':
  mpeg12enc: Add missing #include for PICT_FRAME

See: 9517900bef528527d8507da5a1992f99513d71b4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7cb66ebc0be48489785f7166c9d15eac594b0763'
Michael Niedermayer [Thu, 21 Aug 2014 19:30:31 +0000 (21:30 +0200)]
Merge commit '7cb66ebc0be48489785f7166c9d15eac594b0763'

* commit '7cb66ebc0be48489785f7166c9d15eac594b0763':
  error_resilience: Drop asserts from guess_mv()

Conflicts:
libavcodec/error_resilience.c

Not merged, the asserts in FFmpeg build and work fine

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

* commit '11cd727fbd603197cb1e49654fce3352d56f8fd8':
  vsrc_movie: Adjust a silly typo from b977b287f61fea48ecd6251d54a26334213b7ec6

Conflicts:
libavfilter/src_movie.c

No change, the typo is not part of FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/hevc_res_add: refactor ff_hevc_transform_add{16,32}_8
James Almer [Wed, 20 Aug 2014 22:36:29 +0000 (19:36 -0300)]
x86/hevc_res_add: refactor ff_hevc_transform_add{16,32}_8

* Reduced xmm register count to 7 (As such they are now enabled for x86_32).
* Removed four movdqa (affects the sse2 version only).
* pxor is now used to clear m0 only once.

~5% faster.

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agowavpackenc: assert on too small buffer
Christophe Gisquet [Tue, 19 Aug 2014 12:05:56 +0000 (14:05 +0200)]
wavpackenc: assert on too small buffer

bytestream2_* will not cause buffer overflow, but in that case, this means
the allocation would be incorrect and the encoded result invalid. Therefore,
assert no overflow occurred.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Suppress "potentially uninitialized variable" warnings from MSVC
Diego Biurrun [Fri, 15 Aug 2014 18:03:27 +0000 (20:03 +0200)]
configure: Suppress "potentially uninitialized variable" warnings from MSVC

The same is done for GCC and clang already.

5 years agoavformat/mov: use 64bit for size in mov_skip_multiple_stsd()
Michael Niedermayer [Thu, 21 Aug 2014 15:28:11 +0000 (17:28 +0200)]
avformat/mov: use 64bit for size in mov_skip_multiple_stsd()

Fixes integer overflow
Fixes Ticket 3866

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/filters/apad: extend documentation
Stefano Sabatini [Mon, 18 Aug 2014 12:52:08 +0000 (14:52 +0200)]
doc/filters/apad: extend documentation

5 years agolavfi/apad: fix logic when whole_len or pad_len options are specified
Stefano Sabatini [Mon, 18 Aug 2014 12:51:25 +0000 (14:51 +0200)]
lavfi/apad: fix logic when whole_len or pad_len options are specified

In particular, allow pad_len and whole_len to have value set to 0, which
means that no padding will be added. Previously a value set to 0 meant
that that the filter had to pad forever.

The new semantics is clearer, also simplifies scripting since the option
value might be automatically computed, so that no checks need to be done
in case it is 0.

The old semantics was never documented and the logic was broken (the
filter was always adding samples indefinitely), so this should not break
backward compatibility.

5 years agoimc: reject files with unfathomable sampling rates
Christophe Gisquet [Thu, 21 Aug 2014 10:21:07 +0000 (12:21 +0200)]
imc: reject files with unfathomable sampling rates

With huge sampling rates, the table derivation method does not converge fast
enough. While fixing it using e.g. Newton-Rhapson-like methods (the curve is
nicely convex) is possible, it is much simpler to reject these cases.

The value of 96000 was arbitrarily chosen as a realistic value, though
1000000 would still work and converge.

Fixes ticket #3868.

Suggested-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_lenscorrection: fix memleak
Michael Niedermayer [Thu, 21 Aug 2014 10:16:07 +0000 (12:16 +0200)]
avfilter/vf_lenscorrection: fix memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoadts: Return more meaningful error codes
Nidhi Makhijani [Fri, 15 Aug 2014 11:37:24 +0000 (17:07 +0530)]
adts: Return more meaningful error codes

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agosetpts: Add missing inttypes.h #include for PRId64
Diego Biurrun [Wed, 20 Aug 2014 16:54:50 +0000 (09:54 -0700)]
setpts: Add missing inttypes.h #include for PRId64

Also convert a debug av_log() to av_dlog().

5 years agompeg12enc: Add missing #include for PICT_FRAME
Diego Biurrun [Wed, 20 Aug 2014 16:48:54 +0000 (09:48 -0700)]
mpeg12enc: Add missing #include for PICT_FRAME

5 years agoerror_resilience: Drop asserts from guess_mv()
Diego Biurrun [Wed, 20 Aug 2014 16:35:08 +0000 (09:35 -0700)]
error_resilience: Drop asserts from guess_mv()

The asserts check struct members that are not referenced in guess_mv()
and one of them fails to compile.

5 years agovsrc_movie: Adjust a silly typo from b977b287f61fea48ecd6251d54a26334213b7ec6
Diego Biurrun [Wed, 20 Aug 2014 16:56:26 +0000 (09:56 -0700)]
vsrc_movie: Adjust a silly typo from b977b287f61fea48ecd6251d54a26334213b7ec6

5 years agodoc/APIChanges: fill 2 hashes from my recent API additions
Clément Bœsch [Thu, 21 Aug 2014 10:36:28 +0000 (12:36 +0200)]
doc/APIChanges: fill 2 hashes from my recent API additions

5 years agoavutil/motion_vector.h: fix coordinate types
Clément Bœsch [Wed, 20 Aug 2014 21:24:17 +0000 (23:24 +0200)]
avutil/motion_vector.h: fix coordinate types

See b0352b1997a83f1b6b27919b94aab539f099b25b for more information on the
feature.

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>