Hendrik Leppkes
4eded225ad
Merge commit 'fe026ba960790a004adfcff33f44f96b05538e5c'
...
* commit 'fe026ba960790a004adfcff33f44f96b05538e5c':
drawtext: Drop stray guards
Conflicts:
libavfilter/vf_drawtext.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2015-08-05 12:15:41 +02:00
Hendrik Leppkes
00b5c19661
Merge commit '4fee11ab05fc8569ef35c0ce86a60375c903eefb'
...
* commit '4fee11ab05fc8569ef35c0ce86a60375c903eefb':
png: Be more informative regarding signature errors
Conflicts:
libavcodec/pngdec.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2015-08-05 12:10:08 +02:00
Michael Niedermayer
e5774f28d1
avcodec/dvbsubdec: Do not stop decoding at a invalid depth
...
This corrects parsing the later elements
Fixes Ticket4754
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-05 00:16:43 +02:00
Timo Rothenpieler
2ae45816b2
avcodec/nvenc: Add support for 2pass rc in vbr mode
...
Thanks to WereCatf for pointing out this now exists.
Github: Closes #143
2015-08-04 21:38:10 +02:00
Timo Rothenpieler
3a20e5bc3b
avcodec/nvenc: Only set h264 parameter when encoding h264
2015-08-04 21:38:10 +02:00
Timo Rothenpieler
bef740688d
avcodec/nvenc: Fix indentation
2015-08-04 21:38:10 +02:00
Hendrik Leppkes
bec062e57c
wmv2enc: remove duplicate priv_class in codec definition
2015-08-04 21:35:54 +02:00
Carl Eugen Hoyos
128e722bc1
lavf/swf: Fix auto-detection of compressed files.
...
Fixes auto-detection of compressed swf files as in
http://samples.ffmpeg.org/SWF/compressed-swf/
Reported by forum user Zard1096.
2015-08-04 21:34:00 +02:00
Henrik Gramner
f0b7882ceb
x86inc: Drop SECTION_TEXT macro
...
The .text section is already 16-byte aligned by default on all supported
platforms so `SECTION_TEXT` isn't any different from `SECTION .text`.
2015-08-04 20:13:09 +02:00
Henrik Gramner
826790f596
x86inc: Support arbitrary stack alignments
...
Change ALLOC_STACK to always align the stack before allocating stack space for
consistency. Previously alignment would occur either before or after allocating
stack space depending on whether manual alignment was required or not.
2015-08-04 20:13:09 +02:00
Hendrik Leppkes
99f8fc725d
ffmpeg: remove access to private FILE struct members on Windows
...
The FILE struct is opaque in MSVC 2015, and the members of this struct
were never meant to be accessed in any case.
No conditions are known where this check was needed to get characters
from stdin.
2015-08-04 20:05:18 +02:00
Hendrik Leppkes
2ab5002e3c
ffmpeg: avoid scanf in keyboard command parsing
...
Mixing stdio and low-level IO on stdin is not safe.
2015-08-04 20:04:53 +02:00
Philip Langdale
3c8652208b
MAINTAINERS: Add myself to vdpau maintainers
2015-08-04 08:22:19 -07:00
Philip Langdale
f038bbd4ed
avcodec/vdpau_hevc: Properly signal the num_delta_pocs from the SPS RPS
...
This is the same fix that Hendrik made to dxva2_hevc. It should be
equally required here, although I don't see any visual difference.
Nevertheless, best to stay consistent.
2015-08-04 08:22:19 -07:00
Philip Langdale
aa10f0aab0
avcodec/vdpau_hevc: Remove experimental flag
...
The latest nvidia 355.06 drivers fixes the interleaving bug when
video surfaces are rendered. It still seems to be broken for
read-back with getBits but that's sufficiently uninteresting that
I don't think we need to wait for it to remove the flag.
2015-08-04 08:22:19 -07:00
Shivraj Patil
dec16372df
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP8 functions
...
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com >
2015-08-04 11:15:06 -04:00
Paul B Mahol
63c442e3b1
avfilter/avf_showspectrum: reindent
2015-08-04 15:18:51 +02:00
Carl Eugen Hoyos
087c0a0a93
lavc/dvbsub: Do not fail on clut depth 0.
...
Fixes ticket #4752 .
2015-08-04 15:01:22 +02:00
Carl Eugen Hoyos
4c4f14c717
lavd/v4l2: Use AVSTREAM_PARSE_FULL_ONCE when reading a h264 stream.
...
Reported, debugged and tested by trac user noah.
Fixes ticket #4644 .
2015-08-04 14:59:26 +02:00
Michael Niedermayer
3f87a17063
avcodec/dvbsubdec: Allow selecting the substream, or all substreams
...
Fixes Ticket 2161
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-04 14:24:13 +02:00
Matthieu Bouron
f6518e51b8
lavf/mxfdec: support segmented frame layout as separate fields layout
...
According to S377M, segmented frame layout is identical to separate
field layout except that the two fields are taken from a single scan
of the incoming image, ie: they are coincident in time. Thus the
resulting frame is progressive.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-04 13:03:29 +02:00
Shiz
2480da12a4
configure: Silence error messages when probing compiler.
...
On Xcode's clang on OS X, $cc --version will output a 'Configured with:'
line to stderr, which clobbers the configure script output. As this line
serves no further purpose, it should be silenced.
The same applies to apple-gcc 4.2.1, which complains that it can not
understand the kernel version it is running on.
Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-04 11:00:54 +02:00
Michael Niedermayer
e322b7061f
avcodec/dcaenc: clear bitstream end
...
This avoids leaving uninitialized bits in the output
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-04 04:16:43 +02:00
Michael Niedermayer
d903b62750
avcodec/internal: improve min_size documentation for ff_alloc_packet2()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-04 04:16:43 +02:00
James Almer
5750d6c5e9
x86: move XOP emulation code back to x86inc
...
Only two functions that use xop multiply-accumulate instructions where the
first operand is the same as the fourth actually took advantage of the macros.
This further reduces differences with x264's x86inc.
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2015-08-03 17:11:13 -03:00
Michael Niedermayer
2ca0ed9cfd
doc/git-howto: Replace "git push" example by one with dry-run
...
I do not think having "git push" as example is a good idea.
The command has a very high chance of pushing things which are unwanted to be
pushed
Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-03 19:33:46 +02:00
Hendrik Leppkes
5d324dae11
dxva2_hevc: properly signal the num_delta_pocs from the SPS RPS
...
ucNumDeltaPocsOfRefRpsIdx needs to contain the flat value from the SPS RPS,
and not the final computed value from the slice header RPS, as this calculation
is done internally by the driver again.
Sample-Id: http://trailers.divx.com/hevc/Sintel_4k_27qp_24fps_1aud_9subs.mkvi
2015-08-03 15:48:21 +02:00
Michael Niedermayer
8bdd0dbd60
avcodec/videotoolbox: Add missing AV_ prefix to CODEC_ID in comment
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-03 14:47:11 +02:00
Michael Niedermayer
6b0fa73b4d
avcodec/videotoolbox: Fix bistream typo
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-03 14:46:24 +02:00
Michael Niedermayer
4302a92835
avcodec/pcm: Better min_size for ff_alloc_packet2()
...
33318 -> 30601 decicycles
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-03 14:31:03 +02:00
Michael Niedermayer
fdc2385ca9
avcodec/libwebpenc_animencoder: Use ff_alloc_packet2()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-03 14:31:03 +02:00
Michael Niedermayer
77fb14f039
avcodec/rawenc: Use ff_alloc_packet2()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-03 14:31:03 +02:00
Sebastien Zwickert
11d923d414
avcodec: add new Videotoolbox hwaccel.
2015-08-03 10:12:10 +02:00
Henrik Gramner
127203ba5a
x86inc: Various minor backports from x264
...
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-03 04:08:33 +02:00
Henrik Gramner
f151fbd9e5
x86inc: Disable vpbroadcastq workaround in newer yasm versions
...
The bug was fixed in 1.3.0, so only perform the workaround in earlier versions.
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-03 03:13:20 +02:00
Michael Niedermayer
7f46a641bf
avcodec/aacdec: Fix integer overflow in argument to decode_audio_specific_config()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-03 01:41:13 +02:00
Emanuel Czirai
7ab1c57a64
libavcodec/aacdec_template: Use init_get_bits8() in aac_decode_frame()
...
related to ticket4749
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-03 01:18:33 +02:00
Michael Niedermayer
0508657f42
avcodec/cngenc: Use ff_alloc_packet2()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-02 23:02:12 +02:00
Michael Niedermayer
7e9cd4e100
avcodec/libwebpenc: Use ff_alloc_packet2()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-02 20:58:31 +02:00
Michael Niedermayer
06f2659891
avcodec/v210enc: Use ff_alloc_packet2()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-02 20:57:39 +02:00
Michael Niedermayer
107026ea81
avcodec/aliaspixenc: Use ff_alloc_packet2()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-02 20:36:24 +02:00
Michael Niedermayer
4a8ec0218e
avcodec/avuienc: Use ff_alloc_packet2()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-02 20:24:30 +02:00
Rico Tzschichholz
a0044becca
libshine: Fix faulty ff_alloc_packet2 usage
2015-08-02 19:05:26 +02:00
Paul B Mahol
3fe01eca21
avcodec/xfaceenc: remove coded_frame usage
2015-08-02 18:41:12 +02:00
Paul B Mahol
5b69fb783e
avfilter: add atadenoise
2015-08-02 18:19:19 +02:00
Luca Barbato
fe026ba960
drawtext: Drop stray guards
...
There is a fallback for localtime_r and it is in use already.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2015-08-02 15:14:33 +02:00
Luca Barbato
4fee11ab05
png: Be more informative regarding signature errors
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2015-08-02 14:31:09 +02:00
Paul B Mahol
49a14a7616
avfilter: add allyuv source filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2015-08-02 14:13:59 +02:00
Paul B Mahol
ff6c92447d
avfilter/vf_deband: add mising slice thread flag
2015-08-02 14:00:34 +02:00
Paul B Mahol
ff8f6691ce
avfilter/f_drawgraph: stop making foreground color transparent
2015-08-02 13:34:30 +02:00