Commit Graph

66073 Commits

Author SHA1 Message Date
Michael Niedermayer
ee83f667af Merge commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74'
* commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74':
  mpegts: Allow custom max resync size

Conflicts:
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-03 12:44:14 +02:00
Michael Niedermayer
4d13d440ee Merge commit '94f084324e648876508bed546d950762f10b875e'
* commit '94f084324e648876508bed546d950762f10b875e':
  texi2pod: Make it output a single encoding string

Conflicts:
	doc/texi2pod.pl

See: 12ce58bebd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-03 12:24:47 +02:00
Michael Niedermayer
eacf42dd50 Merge commit '4912b634b517c8acfc476c5d47f10be83fe7e18b'
* commit '4912b634b517c8acfc476c5d47f10be83fe7e18b':
  x265: Use the encoder defaults

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-03 12:10:09 +02:00
Michael Niedermayer
928cb84b32 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>
2014-09-03 05:19:06 +02:00
Michael Niedermayer
50841da143 avcodec/mpeg4videodec: fix automatic use of the xvid idct on non x86
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-03 05:19:06 +02:00
Michael Niedermayer
feac9cbed0 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>
2014-09-03 04:13:37 +02:00
Michael Niedermayer
5b58d79a99 Merge commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453'
* commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453':
  xvid: Add C IDCT

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

See: 298b3b6c1f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-03 04:09:38 +02:00
Michael Niedermayer
5db23c07a3 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>
2014-09-03 03:19:40 +02:00
Luca Barbato
7968059e5c mpegts: Allow custom max resync size 2014-09-03 02:38:03 +02:00
Luca Barbato
94f084324e texi2pod: Make it output a single encoding string
Intermixing =encoding utf-8 in the file can confuse some pod2man
implementations.
2014-09-03 02:14:17 +02:00
Luca Barbato
4912b634b5 x265: Use the encoder defaults
Reset the settings as it is done for x264.
2014-09-03 02:14:17 +02:00
Gabriel Dume
eda7571ea1 wmv2: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-09-02 16:14:22 -07:00
Pascal Massimino
7a1d6ddd2c xvid: Add C IDCT
Thanks to Pascal Massimino and Michael Militzer for relicensing as LGPL.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-09-02 14:41:13 -07:00
Diego Biurrun
95c0cec03a 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.
2014-09-02 14:41:13 -07:00
Michael Niedermayer
9e59a7be1c Merge commit '91d305790ea0f6fe0f54b48236da42181c39c18b'
* commit '91d305790ea0f6fe0f54b48236da42181c39c18b':
  get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE

Conflicts:
	libavcodec/golomb.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-02 22:18:12 +02:00
Michael Niedermayer
c8be5258de 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>
2014-09-02 22:07:06 +02:00
Michael Niedermayer
4c73123333 Merge commit 'f61e47dd68582529bcf6d42d861c70a320cd1b67'
* commit 'f61e47dd68582529bcf6d42d861c70a320cd1b67':
  asv: K&R formatting cosmetics

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-02 21:57:46 +02:00
Michael Niedermayer
50c6bffb67 Merge commit '74512f7e369da40e1148c92b58cd8e59f7737b8f'
* commit '74512f7e369da40e1148c92b58cd8e59f7737b8f':
  8svx: Return proper error codes

Conflicts:
	libavcodec/8svx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-02 21:45:58 +02:00
Reimar Döffinger
098af26067 vf_deshake: Avoid doing a malloc+free for every single frame.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-09-02 19:20:28 +02:00
Reimar Döffinger
4ea8406e38 vf_deshake: reduce stack usage.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-09-02 19:20:28 +02:00
Reimar Döffinger
3980ab12b7 rangecoder-test: Allow running with small stack size.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-09-02 19:20:28 +02:00
Reimar Döffinger
e48cd2de98 rl.h: Use on-stack temporary VLC tables instead of having them static.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-09-02 19:20:28 +02:00
Reimar Döffinger
2ca78936c7 rl.h: remove deprecated and now unused vlc member.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-09-02 19:20:27 +02:00
Tobias Rapp
2c43cfe2d4 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>
2014-09-02 18:44:07 +02:00
Michael Niedermayer
1c55d0ff32 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>
2014-09-02 13:37:07 +02:00
Michael Niedermayer
1587989518 avcodec/rawdec: Support CODEC_CAP_PARAM_CHANGE
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-02 13:35:36 +02:00
Diego Biurrun
91d305790e get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE
The HAVE_ prefix is reserved for macros set by configure.
2014-09-02 13:10:38 +02:00
Gabriel Dume
ff4d1aa8bc flv: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-09-02 04:03:45 -07:00
Gabriel Dume
f61e47dd68 asv: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-09-02 03:45:21 -07:00
Gabriel Dume
74512f7e36 8svx: Return proper error codes
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-09-02 03:42:13 -07:00
Mika Raento
502fc3b3d4 segment: fix copying stream metadata
To get mpegts metadata copied when segmenting.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-02 12:31:04 +02:00
Mika Raento
413fa76f61 segment: use mpegts_flags instead of the deprecated resend_headers option
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-02 12:31:04 +02:00
Michael Niedermayer
0ffe32cf8f 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>
2014-09-02 12:31:04 +02:00
Carl Eugen Hoyos
3668168afa Support decoding of ImageJ png in avi.
Fixes ticket #3916.
2014-09-02 12:02:03 +02:00
Mika Raento
58e0402e02 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>
2014-09-02 11:38:36 +02:00
Michael Niedermayer
35469835bb Merge commit 'e48d1ea541be4592ebac89875557407ca958b7a9'
* commit 'e48d1ea541be4592ebac89875557407ca958b7a9':
  ismindex: improve diagnostics

Conflicts:
	tools/ismindex.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-02 11:20:13 +02:00
Mika Raento
e48d1ea541 ismindex: improve diagnostics
This improves error messages for completely and somewhat broken inputs.

Signed-off-by: Martin Storsjö <martin@martin.st>
2014-09-02 09:48:44 +03:00
Mark Harris
4cabee50f6 tools/normalize.py: both input and output file names are required 2014-09-02 07:31:34 +02:00
Clément Bœsch
e6b125e3be avutil/pixelutils: add small buffers tests 2014-09-02 07:29:41 +02:00
Rong Yan
6abeaf2781 build sys: enable the decoding_encoding example under the ffmpeg/doc/examples
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-02 04:19:15 +02:00
Carl Eugen Hoyos
7cf1f0f4af Fix standalone compilation of the snow decoder. 2014-09-01 23:30:57 +02:00
Mark Harris
1b3a98f137 doc/filters.texi: fix filter name in examples
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-01 21:50:52 +02:00
Thomas Volkert
f8164f6728 Add missing changelog entry
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-01 21:40:34 +02:00
Michael Niedermayer
f9aadf1fc4 Merge commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5'
* commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5':
  mpeg4videodec: Fix low_delay error message

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-01 21:01:33 +02:00
Michael Niedermayer
f626eaa58e Merge commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2'
* commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2':
  aac_adtstoasc_bsf: Return proper error code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-01 20:51:44 +02:00
Michael Niedermayer
38c4316fff Merge commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae'
* commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae':
  dxva2: Clean up definition of _WIN32_WINNT

Conflicts:
	libavcodec/dxva2.h

See: 89946c8403
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-01 20:45:50 +02:00
Michael Niedermayer
052cd1ce72 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: 64c53fa16a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-01 20:31:13 +02:00
Michael Niedermayer
b01d2a5533 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>
2014-09-01 19:51:58 +02:00
Michael Niedermayer
a2dbf379f0 avcodec/dvbsubdec: make compute_edt user settable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-01 19:51:58 +02:00
Reimar Döffinger
e8d0b84e8a 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>
2014-09-01 19:41:20 +02:00