OSDN Git Service
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Luca Barbato [Sat, 9 Aug 2014 19:37:02 +0000 (21:37 +0200)]
x11grab: Fallback to normal XImage if SHM is not supported
Luca Barbato [Thu, 28 Aug 2014 17:40:45 +0000 (19:40 +0200)]
ppc: Support little endian intreadwrite
Luca Barbato [Mon, 25 Aug 2014 10:11:32 +0000 (12:11 +0200)]
mpegts: Allow custom max resync size
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.
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.
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>
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>
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.
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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.
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>
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>
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>
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>
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>
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>
Carl Eugen Hoyos [Tue, 2 Sep 2014 10:02:03 +0000 (12:02 +0200)]
Support decoding of ImageJ png in avi.
Fixes ticket #3916.
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>
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>
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>
Mark Harris [Mon, 1 Sep 2014 22:13:42 +0000 (15:13 -0700)]
tools/normalize.py: both input and output file names are required
Clément Bœsch [Sun, 31 Aug 2014 15:11:22 +0000 (17:11 +0200)]
avutil/pixelutils: add small buffers tests
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>
Carl Eugen Hoyos [Mon, 1 Sep 2014 21:30:57 +0000 (23:30 +0200)]
Fix standalone compilation of the snow decoder.
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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.
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.
Clément Bœsch [Mon, 1 Sep 2014 09:36:02 +0000 (11:36 +0200)]
RELEASE_NOTES: mention libmodplug detection change
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.
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.
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>
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>
Michael Niedermayer [Sun, 31 Aug 2014 23:48:50 +0000 (00:48 +0100)]
avcodec: fix missing doxygen comment marker
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Carl Eugen Hoyos [Sat, 30 Aug 2014 10:33:28 +0000 (12:33 +0200)]
lavf/rtpdec_hevc: Fix compilation with -DDEBUG.
Carl Eugen Hoyos [Sat, 30 Aug 2014 10:27:50 +0000 (12:27 +0200)]
ffmpeg: Clean up if filter initialisation failed to avoid a memleak.
Fixes ticket #3858.
Reviewed-by: Nicolas George
Michael Niedermayer [Sat, 30 Aug 2014 10:48:31 +0000 (12:48 +0200)]
avcodec/aarch64/h264qpel_init_aarch64: mark src as const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 30 Aug 2014 10:42:16 +0000 (12:42 +0200)]
avformat/udp: Move variables used only with HAVE_PTHREAD_CANCEL, under the #if
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 30 Aug 2014 10:21:07 +0000 (12:21 +0200)]
avformat/id3v2: Fix "warning: unused variable uncompressed_buffer_size" if zlib is unavailable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 30 Aug 2014 10:16:46 +0000 (12:16 +0200)]
avfilter/vf_mp: remove incorrect usage of AVFrame.type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 30 Aug 2014 00:12:10 +0000 (02:12 +0200)]
avcodec/snow: check coeffs for validity
Fixes deadlock
Fixes integer overflow
Fixes Ticket 3892
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>