ffmpeg.git
5 years agoMerge commit '95e177eeb21f3e968aa9353bc69d1946966cc835'
Michael Niedermayer [Wed, 3 Sep 2014 12:56:12 +0000 (14:56 +0200)]
Merge commit '95e177eeb21f3e968aa9353bc69d1946966cc835'

* commit '95e177eeb21f3e968aa9353bc69d1946966cc835':
  rtpdec: HEVC/H.265 support

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

See: 96b2ba68c4aef4e92b3e9de87d1fb94f2fb659f0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ebef9f5a56d7df91e010a177a80cfc8dbe394305'
Michael Niedermayer [Wed, 3 Sep 2014 12:24:53 +0000 (14:24 +0200)]
Merge commit 'ebef9f5a56d7df91e010a177a80cfc8dbe394305'

* commit 'ebef9f5a56d7df91e010a177a80cfc8dbe394305':
  time: Use clock_gettime if the monotonic clock is available

Conflicts:
configure

The change to av_gettime() isnt merged, a patch will be posted to the mailing list
that would do the switch

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d'
Michael Niedermayer [Wed, 3 Sep 2014 11:58:41 +0000 (13:58 +0200)]
Merge commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d'

* commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d':
  x11grab: Refactor pixel format parsing

Conflicts:
libavdevice/x11grab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc'
Michael Niedermayer [Wed, 3 Sep 2014 11:29:49 +0000 (13:29 +0200)]
Merge commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc'

* commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc':
  x11grab: Fallback to normal XImage if SHM is not supported

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c19a49e565bd06ea47947d50779ba236df9d4943'
Michael Niedermayer [Wed, 3 Sep 2014 11:11:55 +0000 (13:11 +0200)]
Merge commit 'c19a49e565bd06ea47947d50779ba236df9d4943'

* commit 'c19a49e565bd06ea47947d50779ba236df9d4943':
  ppc: Support little endian intreadwrite

Conflicts:
libavutil/ppc/intreadwrite.h

See: d37c620c84e28400ad071d1c75cc81445b4acb29
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegts: Change order of structs to match 7968059e5c3cd8f91407f379c11bbf71a1b...
Michael Niedermayer [Wed, 3 Sep 2014 10:52:34 +0000 (12:52 +0200)]
avformat/mpegts: Change order of structs to match 7968059e5c3cd8f91407f379c11bbf71a1b84c74

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74'
Michael Niedermayer [Wed, 3 Sep 2014 10:44:14 +0000 (12:44 +0200)]
Merge commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74'

* commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74':
  mpegts: Allow custom max resync size

Conflicts:
libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '94f084324e648876508bed546d950762f10b875e'
Michael Niedermayer [Wed, 3 Sep 2014 10:24:47 +0000 (12:24 +0200)]
Merge commit '94f084324e648876508bed546d950762f10b875e'

* commit '94f084324e648876508bed546d950762f10b875e':
  texi2pod: Make it output a single encoding string

Conflicts:
doc/texi2pod.pl

See: 12ce58bebdff6bfae9c56dc785e3003968f93277
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4912b634b517c8acfc476c5d47f10be83fe7e18b'
Michael Niedermayer [Wed, 3 Sep 2014 10:10:01 +0000 (12:10 +0200)]
Merge commit '4912b634b517c8acfc476c5d47f10be83fe7e18b'

* commit '4912b634b517c8acfc476c5d47f10be83fe7e18b':
  x265: Use the encoder defaults

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/idctdsp: Initialize ff_put/add_pixels_clamped correctly so that the optimized...
Michael Niedermayer [Wed, 3 Sep 2014 02:52:50 +0000 (04:52 +0200)]
avcodec/idctdsp: Initialize ff_put/add_pixels_clamped correctly so that the optimized functions are also used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpeg4videodec: fix automatic use of the xvid idct on non x86
Michael Niedermayer [Wed, 3 Sep 2014 03:18:09 +0000 (05:18 +0200)]
avcodec/mpeg4videodec: fix automatic use of the xvid idct on non x86

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce'
Michael Niedermayer [Wed, 3 Sep 2014 02:13:37 +0000 (04:13 +0200)]
Merge commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce'

* commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce':
  wmv2: K&R formatting cosmetics

Conflicts:
libavcodec/wmv2.c
libavcodec/wmv2dec.c
libavcodec/wmv2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453'
Michael Niedermayer [Wed, 3 Sep 2014 01:55:23 +0000 (03:55 +0200)]
Merge commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453'

* commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453':
  xvid: Add C IDCT

Conflicts:
libavcodec/dct-test.c
libavcodec/xvididct.c

See: 298b3b6c1f8f66b9bc6de53a7b51d3de745d946b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '95c0cec03acec0a80cc1c7db48f3b2355d9e767b'
Michael Niedermayer [Wed, 3 Sep 2014 01:18:07 +0000 (03:18 +0200)]
Merge commit '95c0cec03acec0a80cc1c7db48f3b2355d9e767b'

* commit '95c0cec03acec0a80cc1c7db48f3b2355d9e767b':
  idctdsp: Add global function pointers for {add|put}_pixels_clamped functions

Conflicts:
libavcodec/arm/idctdsp_init_arm.c
libavcodec/dct.h
libavcodec/idctdsp.c
libavcodec/jrevdct.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agortpdec: HEVC/H.265 support
Thomas Volkert [Tue, 26 Aug 2014 19:00:03 +0000 (21:00 +0200)]
rtpdec: HEVC/H.265 support

As specified in draft-ietf-payload-rtp-h265-06.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agotime: Use clock_gettime if the monotonic clock is available
Luca Barbato [Sun, 24 Aug 2014 16:14:47 +0000 (18:14 +0200)]
time: Use clock_gettime if the monotonic clock is available

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agox11grab: Refactor pixel format parsing
Luca Barbato [Sun, 10 Aug 2014 15:32:18 +0000 (17:32 +0200)]
x11grab: Refactor pixel format parsing

5 years agox11grab: Fallback to normal XImage if SHM is not supported
Luca Barbato [Sat, 9 Aug 2014 19:37:02 +0000 (21:37 +0200)]
x11grab: Fallback to normal XImage if SHM is not supported

5 years agoppc: Support little endian intreadwrite
Luca Barbato [Thu, 28 Aug 2014 17:40:45 +0000 (19:40 +0200)]
ppc: Support little endian intreadwrite

5 years agompegts: Allow custom max resync size
Luca Barbato [Mon, 25 Aug 2014 10:11:32 +0000 (12:11 +0200)]
mpegts: Allow custom max resync size

5 years agotexi2pod: Make it output a single encoding string
Luca Barbato [Sun, 31 Aug 2014 23:30:44 +0000 (01:30 +0200)]
texi2pod: Make it output a single encoding string

Intermixing =encoding utf-8 in the file can confuse some pod2man
implementations.

5 years agox265: Use the encoder defaults
Luca Barbato [Thu, 28 Aug 2014 01:49:05 +0000 (03:49 +0200)]
x265: Use the encoder defaults

Reset the settings as it is done for x264.

5 years agowmv2: K&R formatting cosmetics
Gabriel Dume [Tue, 2 Sep 2014 19:28:51 +0000 (15:28 -0400)]
wmv2: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoxvid: Add C IDCT
Pascal Massimino [Wed, 27 Aug 2014 00:58:10 +0000 (02:58 +0200)]
xvid: Add C IDCT

Thanks to Pascal Massimino and Michael Militzer for relicensing as LGPL.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoidctdsp: Add global function pointers for {add|put}_pixels_clamped functions
Diego Biurrun [Sun, 31 Aug 2014 18:45:15 +0000 (11:45 -0700)]
idctdsp: Add global function pointers for {add|put}_pixels_clamped functions

These function pointers already existed in the ARM code. Adding them globally
allows calls to the function pointers to access arch-optimized versions of the
functions transparently.

5 years agoMerge commit '91d305790ea0f6fe0f54b48236da42181c39c18b'
Michael Niedermayer [Tue, 2 Sep 2014 20:18:12 +0000 (22:18 +0200)]
Merge commit '91d305790ea0f6fe0f54b48236da42181c39c18b'

* commit '91d305790ea0f6fe0f54b48236da42181c39c18b':
  get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE

Conflicts:
libavcodec/golomb.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef'
Michael Niedermayer [Tue, 2 Sep 2014 20:07:06 +0000 (22:07 +0200)]
Merge commit 'ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef'

* commit 'ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef':
  flv: K&R formatting cosmetics

Conflicts:
libavcodec/flv.h
libavcodec/flvdec.c
libavcodec/flvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f61e47dd68582529bcf6d42d861c70a320cd1b67'
Michael Niedermayer [Tue, 2 Sep 2014 19:57:46 +0000 (21:57 +0200)]
Merge commit 'f61e47dd68582529bcf6d42d861c70a320cd1b67'

* commit 'f61e47dd68582529bcf6d42d861c70a320cd1b67':
  asv: K&R formatting cosmetics

Conflicts:
libavcodec/asvdec.c
libavcodec/asvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '74512f7e369da40e1148c92b58cd8e59f7737b8f'
Michael Niedermayer [Tue, 2 Sep 2014 19:45:58 +0000 (21:45 +0200)]
Merge commit '74512f7e369da40e1148c92b58cd8e59f7737b8f'

* commit '74512f7e369da40e1148c92b58cd8e59f7737b8f':
  8svx: Return proper error codes

Conflicts:
libavcodec/8svx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovf_deshake: Avoid doing a malloc+free for every single frame.
Reimar Döffinger [Mon, 1 Sep 2014 21:47:12 +0000 (23:47 +0200)]
vf_deshake: Avoid doing a malloc+free for every single frame.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agovf_deshake: reduce stack usage.
Reimar Döffinger [Mon, 1 Sep 2014 21:36:29 +0000 (23:36 +0200)]
vf_deshake: reduce stack usage.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agorangecoder-test: Allow running with small stack size.
Reimar Döffinger [Mon, 1 Sep 2014 21:08:56 +0000 (23:08 +0200)]
rangecoder-test: Allow running with small stack size.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agorl.h: Use on-stack temporary VLC tables instead of having them static.
Reimar Döffinger [Sun, 31 Aug 2014 18:07:40 +0000 (20:07 +0200)]
rl.h: Use on-stack temporary VLC tables instead of having them static.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agorl.h: remove deprecated and now unused vlc member.
Reimar Döffinger [Sun, 31 Aug 2014 12:05:49 +0000 (14:05 +0200)]
rl.h: remove deprecated and now unused vlc member.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agocmdutils: Add some whitespace when printing layouts
Tobias Rapp [Tue, 2 Sep 2014 14:20:45 +0000 (16:20 +0200)]
cmdutils: Add some whitespace when printing layouts

Adds some more whitespace between channel layout name and decomposition.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/swfdec: Use side data to communicate w/h changes to the decoder
Michael Niedermayer [Tue, 2 Sep 2014 03:22:26 +0000 (05:22 +0200)]
avformat/swfdec: Use side data to communicate w/h changes to the decoder

Fixes reading from freed data
Fixes part of Ticket3539

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/rawdec: Support CODEC_CAP_PARAM_CHANGE
Michael Niedermayer [Tue, 2 Sep 2014 03:15:30 +0000 (05:15 +0200)]
avcodec/rawdec: Support CODEC_CAP_PARAM_CHANGE

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoget_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE
Diego Biurrun [Fri, 22 Aug 2014 10:36:12 +0000 (12:36 +0200)]
get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE

The HAVE_ prefix is reserved for macros set by configure.

5 years agoflv: K&R formatting cosmetics
Gabriel Dume [Mon, 1 Sep 2014 19:18:59 +0000 (15:18 -0400)]
flv: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoasv: K&R formatting cosmetics
Gabriel Dume [Mon, 1 Sep 2014 19:18:58 +0000 (15:18 -0400)]
asv: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years ago8svx: Return proper error codes
Gabriel Dume [Mon, 1 Sep 2014 19:18:57 +0000 (15:18 -0400)]
8svx: Return proper error codes

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agosegment: fix copying stream metadata
Mika Raento [Mon, 1 Sep 2014 17:05:44 +0000 (20:05 +0300)]
segment: fix copying stream metadata

To get mpegts metadata copied when segmenting.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agosegment: use mpegts_flags instead of the deprecated resend_headers option
Mika Raento [Mon, 1 Sep 2014 17:05:44 +0000 (20:05 +0300)]
segment: use mpegts_flags instead of the deprecated resend_headers option

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/segment: Use avformat_alloc_output_context2()
Michael Niedermayer [Tue, 2 Sep 2014 10:19:53 +0000 (12:19 +0200)]
avformat/segment: Use avformat_alloc_output_context2()

This avoids having to assign oformat, allows returning the
correct error code and allocates priv_data

Based on patch by: Mika Raento <mika.raento@elisa.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoSupport decoding of ImageJ png in avi.
Carl Eugen Hoyos [Tue, 2 Sep 2014 10:02:03 +0000 (12:02 +0200)]
Support decoding of ImageJ png in avi.

Fixes ticket #3916.

5 years agosegment: don't access outside seg->frames array
Mika Raento [Mon, 1 Sep 2014 17:10:03 +0000 (20:10 +0300)]
segment: don't access outside seg->frames array

Fixes wrong number of segments output and undefined memory access.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e48d1ea541be4592ebac89875557407ca958b7a9'
Michael Niedermayer [Tue, 2 Sep 2014 09:20:13 +0000 (11:20 +0200)]
Merge commit 'e48d1ea541be4592ebac89875557407ca958b7a9'

* commit 'e48d1ea541be4592ebac89875557407ca958b7a9':
  ismindex: improve diagnostics

Conflicts:
tools/ismindex.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoismindex: improve diagnostics
Mika Raento [Mon, 1 Sep 2014 13:16:49 +0000 (16:16 +0300)]
ismindex: improve diagnostics

This improves error messages for completely and somewhat broken inputs.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agotools/normalize.py: both input and output file names are required
Mark Harris [Mon, 1 Sep 2014 22:13:42 +0000 (15:13 -0700)]
tools/normalize.py: both input and output file names are required

5 years agoavutil/pixelutils: add small buffers tests
Clément Bœsch [Sun, 31 Aug 2014 15:11:22 +0000 (17:11 +0200)]
avutil/pixelutils: add small buffers tests

5 years agobuild sys: enable the decoding_encoding example under the ffmpeg/doc/examples
Rong Yan [Tue, 2 Sep 2014 01:46:22 +0000 (21:46 -0400)]
build sys: enable the decoding_encoding example under the ffmpeg/doc/examples

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix standalone compilation of the snow decoder.
Carl Eugen Hoyos [Mon, 1 Sep 2014 21:30:57 +0000 (23:30 +0200)]
Fix standalone compilation of the snow decoder.

5 years agodoc/filters.texi: fix filter name in examples
Mark Harris [Mon, 1 Sep 2014 19:32:33 +0000 (12:32 -0700)]
doc/filters.texi: fix filter name in examples

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAdd missing changelog entry
Thomas Volkert [Mon, 1 Sep 2014 19:18:49 +0000 (21:18 +0200)]
Add missing changelog entry

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5'
Michael Niedermayer [Mon, 1 Sep 2014 19:01:10 +0000 (21:01 +0200)]
Merge commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5'

* commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5':
  mpeg4videodec: Fix low_delay error message

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2'
Michael Niedermayer [Mon, 1 Sep 2014 18:51:31 +0000 (20:51 +0200)]
Merge commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2'

* commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2':
  aac_adtstoasc_bsf: Return proper error code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae'
Michael Niedermayer [Mon, 1 Sep 2014 18:42:50 +0000 (20:42 +0200)]
Merge commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae'

* commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae':
  dxva2: Clean up definition of _WIN32_WINNT

Conflicts:
libavcodec/dxva2.h

See: 89946c8403752fbb26234d98f780188df8951a2e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4600a85eaa6182e5a27464f6b9cae5a9ddbf3098'
Michael Niedermayer [Mon, 1 Sep 2014 18:29:38 +0000 (20:29 +0200)]
Merge commit '4600a85eaa6182e5a27464f6b9cae5a9ddbf3098'

* commit '4600a85eaa6182e5a27464f6b9cae5a9ddbf3098':
  dxva2: Pass variable of correct type to IDirectXVideoDecoder_GetBuffer()

Conflicts:
libavcodec/dxva2_h264.c
libavcodec/dxva2_mpeg2.c
libavcodec/dxva2_vc1.c

See: 64c53fa16aeca9cadd48ccf607803d6e4d26cc4d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: Enable compute_edt only when the subtitles are used for a output stream inste...
Michael Niedermayer [Mon, 1 Sep 2014 02:13:49 +0000 (04:13 +0200)]
ffmpeg: Enable compute_edt only when the subtitles are used for a output stream instead of a filter

Fixes/works around Ticket3768

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dvbsubdec: make compute_edt user settable
Michael Niedermayer [Mon, 1 Sep 2014 02:13:48 +0000 (04:13 +0200)]
avcodec/dvbsubdec: make compute_edt user settable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh261dec, ituh263dec: Move condition.
Reimar Döffinger [Sun, 31 Aug 2014 21:01:09 +0000 (23:01 +0200)]
h261dec, ituh263dec: Move condition.

Stops compiler from doing incredibly stupid things.
With vsynth1-flv inner loop goes from 3501 to 3275
decicycles.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoh261dec, ituh263dec: ensure CLOSE_READER is done on error paths, too.
Reimar Döffinger [Sun, 31 Aug 2014 19:39:22 +0000 (21:39 +0200)]
h261dec, ituh263dec: ensure CLOSE_READER is done on error paths, too.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoh261dec, ituh263dec: Avoid unnecessary -1 inside inner loop.
Reimar Döffinger [Sun, 31 Aug 2014 18:30:04 +0000 (20:30 +0200)]
h261dec, ituh263dec: Avoid unnecessary -1 inside inner loop.

3646 -> 3597 decicycles in inner loop when decoding
vsynth1-flv.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agogeneral: Fix usage of @float
Timothy Gu [Mon, 1 Sep 2014 02:42:50 +0000 (19:42 -0700)]
general: Fix usage of @float

makeinfo chokes on that.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompeg4videodec: Fix low_delay error message
Gabriel Dume [Sat, 30 Aug 2014 02:43:44 +0000 (22:43 -0400)]
mpeg4videodec: Fix low_delay error message

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoaac_adtstoasc_bsf: Return proper error code
Gabriel Dume [Sat, 30 Aug 2014 02:43:43 +0000 (22:43 -0400)]
aac_adtstoasc_bsf: Return proper error code

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agodxva2: Clean up definition of _WIN32_WINNT
Diego Biurrun [Fri, 15 Aug 2014 19:01:15 +0000 (21:01 +0200)]
dxva2: Clean up definition of _WIN32_WINNT

Only set a value if _WIN32_WINNT is undefined or smaller than 0x0600. This is
cleaner than unconditional definition and avoids a number of redefinition
warnings. Also only define a value in one of the two dxva2 headers.

5 years agodxva2: Pass variable of correct type to IDirectXVideoDecoder_GetBuffer()
Diego Biurrun [Fri, 15 Aug 2014 18:51:01 +0000 (20:51 +0200)]
dxva2: Pass variable of correct type to IDirectXVideoDecoder_GetBuffer()

This avoids related incompatible pointer type warnings.

5 years agoRELEASE_NOTES: mention libmodplug detection change
Clément Bœsch [Mon, 1 Sep 2014 09:36:02 +0000 (11:36 +0200)]
RELEASE_NOTES: mention libmodplug detection change

5 years agolavu/avstring: check for overlong encodings in av_utf8_decode()
Stefano Sabatini [Thu, 28 Aug 2014 15:37:27 +0000 (17:37 +0200)]
lavu/avstring: check for overlong encodings in av_utf8_decode()

Fix reopened trac ticket #1163.

5 years agobuild: use pkg-config to detect libmodplug
Clément Bœsch [Mon, 1 Sep 2014 06:58:50 +0000 (08:58 +0200)]
build: use pkg-config to detect libmodplug

Fix static build, at least for OSX.

5 years agoMerge commit '37c46743ee42df1d6986ba3c996e3af5b95511f7'
Michael Niedermayer [Mon, 1 Sep 2014 02:19:08 +0000 (04:19 +0200)]
Merge commit '37c46743ee42df1d6986ba3c996e3af5b95511f7'

* commit '37c46743ee42df1d6986ba3c996e3af5b95511f7':
  avcodec: fix missing doxygen comment marker

See: 22652dc2b8d61d6a48e3f7815fa7f4b0adf0f12f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegts: favor DESC_types over probed codecs
Michael Niedermayer [Mon, 1 Sep 2014 01:15:55 +0000 (03:15 +0200)]
avformat/mpegts: favor DESC_types over probed codecs

Fixes Ticket3766
Fixes dvb_teletext detection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: fix missing doxygen comment marker
Michael Niedermayer [Sun, 31 Aug 2014 23:48:50 +0000 (00:48 +0100)]
avcodec: fix missing doxygen comment marker

5 years agoffserver: tests, use image2 instead of pgmyuv
Reynaldo H. Verdejo Pinochet [Mon, 25 Aug 2014 16:24:02 +0000 (12:24 -0400)]
ffserver: tests, use image2 instead of pgmyuv

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agoituh263dec: Optimize new RL_VLC based decoding.
Reimar Döffinger [Sun, 31 Aug 2014 13:41:36 +0000 (15:41 +0200)]
ituh263dec: Optimize new RL_VLC based decoding.

Together with the switch to RL_VLC this results in
a speedup of about 30% in this inner loop.
Overall speedup only relevant for medium to high bitrate
streams.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoh261dec: Optimize new RL_VLC based decoding.
Reimar Döffinger [Sun, 31 Aug 2014 13:41:13 +0000 (15:41 +0200)]
h261dec: Optimize new RL_VLC based decoding.

Together with the switch to RL_VLC this results in about
10% speedup for this inner loop.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoh261, h263 decoders: convert to RL_VLC.
Reimar Döffinger [Sun, 31 Aug 2014 12:20:23 +0000 (14:20 +0200)]
h261, h263 decoders: convert to RL_VLC.

Some additional optimizations in following patch.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoaacps_tablegen: replace TABLE_CONST by const.
Reimar Döffinger [Sun, 31 Aug 2014 10:41:11 +0000 (12:41 +0200)]
aacps_tablegen: replace TABLE_CONST by const.

Doesn't change generated code, just is more consistent
and a bit less error-prone.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agointmath.h: Remove duplicated ARM include.
Reimar Döffinger [Sun, 31 Aug 2014 10:28:45 +0000 (12:28 +0200)]
intmath.h: Remove duplicated ARM include.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoavcodec/mjpegdec: fix green line at the bottom with upscale v
Michael Niedermayer [Sun, 31 Aug 2014 13:33:30 +0000 (15:33 +0200)]
avcodec/mjpegdec: fix green line at the bottom with upscale v

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: fix green vertical line at the right with upscale h
Michael Niedermayer [Sun, 31 Aug 2014 12:42:53 +0000 (14:42 +0200)]
avcodec/mjpegdec: fix green vertical line at the right with upscale h

Fixes Ticket3891

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovf_drawtext: move "static const" before "struct".
Reimar Döffinger [Sun, 31 Aug 2014 08:40:39 +0000 (10:40 +0200)]
vf_drawtext: move "static const" before "struct".

This is consistent with all other occurrences.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agolavu/hash.c: Add missing "static const".
Reimar Döffinger [Fri, 29 Aug 2014 16:34:28 +0000 (18:34 +0200)]
lavu/hash.c: Add missing "static const".

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoAdd av_cold to table generation functions.
Reimar Döffinger [Sat, 30 Aug 2014 15:35:18 +0000 (17:35 +0200)]
Add av_cold to table generation functions.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoWMA: add "const" to avoid warnings with hardcoded tables.
Reimar Döffinger [Sat, 30 Aug 2014 15:58:51 +0000 (17:58 +0200)]
WMA: add "const" to avoid warnings with hardcoded tables.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoac3dec_fixed: add missing "static const".
Reimar Döffinger [Fri, 29 Aug 2014 16:50:53 +0000 (18:50 +0200)]
ac3dec_fixed: add missing "static const".

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agolavfi: add const/static const to pix_fmts arrays.
Reimar Döffinger [Fri, 29 Aug 2014 16:42:47 +0000 (18:42 +0200)]
lavfi: add const/static const to pix_fmts arrays.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agosipr16kdata.h: add forgotten const.
Reimar Döffinger [Fri, 29 Aug 2014 16:40:14 +0000 (18:40 +0200)]
sipr16kdata.h: add forgotten const.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agofft_template: Move variables to where they are used.
Reimar Döffinger [Fri, 29 Aug 2014 16:32:20 +0000 (18:32 +0200)]
fft_template: Move variables to where they are used.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agofft: add ff_ prefix to some global arrays.
Reimar Döffinger [Fri, 29 Aug 2014 16:26:57 +0000 (18:26 +0200)]
fft: add ff_ prefix to some global arrays.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoavcodec/h264: Do not get stuck on IDR inter frames
Michael Niedermayer [Sun, 31 Aug 2014 01:43:56 +0000 (03:43 +0200)]
avcodec/h264: Do not get stuck on IDR inter frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoxv.c: Add missing const to lookup table.
Reimar Döffinger [Fri, 29 Aug 2014 16:44:22 +0000 (18:44 +0200)]
xv.c: Add missing const to lookup table.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoavformat/dfa: use avio_feof()
Paul B Mahol [Sun, 24 Aug 2014 14:28:02 +0000 (14:28 +0000)]
avformat/dfa: use avio_feof()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agooggdec: fix invalid free on error
wm4 [Sat, 30 Aug 2014 13:39:15 +0000 (15:39 +0200)]
oggdec: fix invalid free on error

The read_packet callback passes a pointer to a stack-allocated AVPacket.
Attempting to free it with av_free() makes no sense.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofft: add missing const.
Reimar Döffinger [Fri, 29 Aug 2014 16:23:52 +0000 (18:23 +0200)]
fft: add missing const.

This table was the largest object in FFmpeg's .data,
and really should be in .rodata.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sat, 30 Aug 2014 12:38:40 +0000 (14:38 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/rtpdec_hevc: Fix compilation with -DDEBUG.
  ffmpeg: Clean up if filter initialisation failed to avoid a memleak.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoproresenc_ks: allow auto-selecting profile
Christophe Gisquet [Mon, 18 Aug 2014 09:27:50 +0000 (11:27 +0200)]
proresenc_ks: allow auto-selecting profile

The user may not know how to select the profile, nor what he needs, in
particular to encode alpha.

Therefore, use an automatic selection as default, and warn when the
manually selected profile may cause issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vp3data: use more compact data types
Michael Niedermayer [Sat, 30 Aug 2014 03:10:26 +0000 (05:10 +0200)]
avcodec/vp3data: use more compact data types

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/rtpdec_hevc: Fix compilation with -DDEBUG.
Carl Eugen Hoyos [Sat, 30 Aug 2014 10:33:28 +0000 (12:33 +0200)]
lavf/rtpdec_hevc: Fix compilation with -DDEBUG.