Michael Niedermayer
e222cfefcd
Merge commit '4d8c28deab2488579f585406110b1be790896e59'
...
* commit '4d8c28deab2488579f585406110b1be790896e59':
imgutils: make systematic palette opaque.
Conflicts:
libavutil/imgutils.c
See: 4d8c28deab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 02:27:35 +02:00
Michael Niedermayer
e6a084641a
avformat/utils: set max analyze duration depending on the circumstances
...
Fixes Ticket3673
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-26 22:33:01 +02:00
Michael Niedermayer
52887aa409
avformat: move default for max_analyze_duration into utils.c
...
this way we can do better tha a single fixed constant value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-26 22:33:01 +02:00
Anton Khirnov
7cc4c9f32f
lavfi/formats: avoid using AV_{PIX,SAMPLE}_FMT_NB
...
Thatt hardcodes the number of formats into lavfi and will break when a
shared lavu is updated, adding new formats.
2014-05-26 22:25:47 +02:00
Anton Khirnov
b03b2d86aa
buffersrc: avoid using AV_PIX_FMT_NB
...
That hardcodes the number of pixel formats into lavfi and will break
when a shared lavu is updated, adding new pixel formats.
2014-05-26 22:25:41 +02:00
Anton Khirnov
a7d070acb5
vf_fieldorder: avoid using AV_PIX_FMT_NB
...
That hardcodes the number of pixel formats into lavfi and will break
when a shared lavu is updated, adding new pixel formats.
2014-05-26 22:25:26 +02:00
Anton Khirnov
862f33c10e
vf_scale: use the pixfmt descriptor API
...
Avoid using AV_PIX_FMT_NB, since that hardcodes the number of pixel
formats into lavfi and will break when a shared lavu is updated, adding
new pixel formats.
2014-05-26 22:24:46 +02:00
Anton Khirnov
45fc73edfe
vf_format: rework format list parsing
...
Avoid using AV_PIX_FMT_NB, since that hardcodes the number of pixel
formats into lavfi and will break when a shared lavu is updated, adding
new pixel formats.
2014-05-26 22:22:42 +02:00
Lou Logan
60ef61242c
MAINTAINERS: add Trac maintainers
...
Signed-off-by: Lou Logan <lou@lrcd.com>
2014-05-26 12:18:29 -08:00
Lou Logan
5b1a56b34b
doc/ffmpeg: note that -t is also an input option
...
Signed-off-by: Lou Logan <lou@lrcd.com>
2014-05-26 12:11:34 -08:00
Lou Logan
2dbf5e7038
configure: s/solving/solve
...
Signed-off-by: Lou Logan <lou@lrcd.com>
2014-05-26 11:54:35 -08:00
Clément Bœsch
53bac1b4bd
doc: add a tutorial for writing filters.
2014-05-26 21:28:19 +02:00
Michael Niedermayer
d35000c2dc
avcodec/g723_1: fix writing into input frame data and warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-26 21:05:03 +02:00
Carl Eugen Hoyos
2d56f0d054
Write the actual mp3 frame size when muxing into caf if available.
...
Fixes ticket #3648 .
2014-05-26 20:28:07 +02:00
Michael Niedermayer
2db89765f3
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
ffmpeg: use thread message API.
lavu: add thread message API.
compat/w32pthreads: add return value to pthread_cond_init().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-26 16:35:52 +02:00
Neil Armstrong
99d742aac4
configure: uClibc native pthread requires -ldl
...
In the configure script, add a pthread detection with
-ldl added to cflags, because uClibc requires -ldl to
link with native libpthread.
Tested with a custom ARM toolchain with uClibc 0.9.33.2 and gcc 4.6.3.
Signed-off-by: Neil Armstrong <narmstrong@neotion.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-26 16:00:25 +02:00
Christophe Gisquet
86ae0da60c
x86: hpeldsp: propagate changes across codecs
...
Some codecs still use mmx versions, so have them use the versions
with newer instruction sets.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-26 15:37:04 +02:00
Nicolas George
fc9c857c2d
ffmpeg: use thread message API.
2014-05-26 11:40:21 +02:00
Nicolas George
55cc60cd6d
lavu: add thread message API.
2014-05-26 11:40:15 +02:00
Nicolas George
58a10e0e2c
compat/w32pthreads: add return value to pthread_cond_init().
2014-05-26 11:33:42 +02:00
Michael Niedermayer
96470ca22b
avformat/mov: allow seeking back to the begin even if nothing is marked as keyframe
...
Fixes Ticket 3663
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-26 01:23:46 +02:00
Michael Niedermayer
d2eacbb754
doc/APIchanges: fix typo in date
2014-05-26 01:22:29 +02:00
Michael Niedermayer
d236d4907c
update APIchanges & version for c37d179
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-26 00:20:07 +02:00
Michael Niedermayer
c37d179295
avformat: add format_probesize to allow tuning the maximum amount of bytes to identify the filetype
...
Currently probesize is cliped at 1mb before being used for format detection.
Alternatively this cliping could be removed but this would then tie various
things like stream analysis to the file detection.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 23:54:34 +02:00
Michael Niedermayer
b0d0e29ffb
avcodec/sgirledec: fix () in RBG323_TO_BGR8() macro
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 23:08:51 +02:00
Michael Niedermayer
9f50d3b944
avcodec/rv34: Fix () in GET_PTS_DIFF() macro
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 21:42:19 +02:00
Michael Niedermayer
a45e6b7bc5
avcodec/psymodel: Fix () in AAC_CUTOFF() macro
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 21:41:57 +02:00
Michael Niedermayer
e5dc7439e3
avcodec/proresenc_anatoliy: Fix () in macros
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 21:41:35 +02:00
Michael Niedermayer
a3950a90f6
Revert "x86: dsputilenc: convert ff_sse{8, 16}_mmx() to yasm"
...
This reverts commit ad733089b0
.
breaks with --disable-yasm
revert requested by: Christophe Gisquet <christophe.gisquet@gmail.com>
2014-05-25 19:42:18 +02:00
Michael Niedermayer
9babf13764
avcodec/msvideo1enc: Fix () in MKRGB555() macro
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 19:26:37 +02:00
Michael Niedermayer
eb718f4c53
avcodec/opus: Fix () in ROUND_MULL() macro
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 19:25:58 +02:00
Michael Niedermayer
d62a4707f9
avcodec/opus_celt: Fix () in CELT_PVQ_V macro
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 19:25:29 +02:00
Michael Niedermayer
c163f5e601
avcodec/pngdec: fix () in OP_* macros
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 19:25:10 +02:00
Timothy Gu
ad733089b0
x86: dsputilenc: convert ff_sse{8, 16}_mmx() to yasm
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 16:30:08 +02:00
Michael Niedermayer
6e725f19f8
configure: try to fix the disappearing "r" bug in fate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 15:44:27 +02:00
Michael Niedermayer
ee9b0199c8
Merge commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9'
...
* commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9':
smoothstream: check malloc calls
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 13:07:45 +02:00
Clément Bœsch
657c603263
avcodec/webvttenc: do not use EOVERFLOW.
...
According to doc/errno.txt EOVERFLOW is not available everywhere. The
use of -1 is consistent with avcodec/srtenc.c.
2014-05-25 10:28:16 +02:00
Carl Eugen Hoyos
4d8c28deab
imgutils: make systematic palette opaque.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-05-25 08:33:15 +02:00
Michael Niedermayer
cf7ff0146c
avcodec/mss4: Fix () in MKVAL() macro
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 05:19:09 +02:00
Michael Niedermayer
6e720c5c81
avcodec/mss34dsp: fix () in SOP* macros
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 05:18:47 +02:00
Michael Niedermayer
fa160af08b
avcodec/mlpdec: fix () in MSB_MASK() macro
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 05:18:18 +02:00
Michael Niedermayer
f276bf303c
avcodec/ivi_dsp: add some missing () to macros
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 03:45:10 +02:00
Michael Niedermayer
70f671c39e
avcodec/hevc: fix () in macros
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 03:45:10 +02:00
Michael Niedermayer
0f45e643cc
avcodec/h264_slice: fix macro ()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 03:45:10 +02:00
Michael Niedermayer
af62b42736
avcodec/h264: fix () in macros
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 03:45:10 +02:00
Michael Niedermayer
97e6b5ee3a
avcodec/golomb-test: fix () in EXTEND() macro
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 03:45:10 +02:00
Michael Niedermayer
fa915d4193
avcodec/aac: fix () in IS_CODEBOOK_UNSIGNED macro
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 03:45:10 +02:00
Aman Gupta
4372fb7a57
avcodec/webvttenc: add webvtt encoder
...
Based off the srt encoder. The following features are unimplemented:
- fonts, colors, sizes
- alignment and positioning
The rest works well. For example, use ffmpeg to convert subtitles into the .vtt format:
ffmpeg -i input.srt output.vtt
Signed-off-by: Aman Gupta <ffmpeg@tmm1.net>
Signed-off-by: Clément Bœsch <u@pkh.me>
2014-05-25 03:04:14 +02:00
James Almer
d94e255dd1
x86/dsputilenc: make the SUM_ABS_DCTELEM macro more readable
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 02:03:54 +02:00
Michael Niedermayer
46e3883519
avcodec/opusdec: check alignment, misalignment could lead to crashes with avx
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25 00:38:20 +02:00