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>
10 years ago
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>
10 years ago
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>
10 years ago
Michael Niedermayer
a2dbf379f0
avcodec/dvbsubdec: make compute_edt user settable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
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>
10 years ago
Reimar Döffinger
36c0043344
h261dec, ituh263dec: ensure CLOSE_READER is done on error paths, too.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
10 years ago
Reimar Döffinger
2a00812d82
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>
10 years ago
Timothy Gu
8d6ec61186
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>
10 years ago
Gabriel Dume
e205fe6831
mpeg4videodec: Fix low_delay error message
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
10 years ago
Gabriel Dume
63f800ca5f
aac_adtstoasc_bsf: Return proper error code
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
10 years ago
Diego Biurrun
b8962d64cc
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.
10 years ago
Diego Biurrun
4600a85eaa
dxva2: Pass variable of correct type to IDirectXVideoDecoder_GetBuffer()
...
This avoids related incompatible pointer type warnings.
10 years ago
Clément Bœsch
343f07e15c
RELEASE_NOTES: mention libmodplug detection change
10 years ago
Stefano Sabatini
d4ec07dfe7
lavu/avstring: check for overlong encodings in av_utf8_decode()
...
Fix reopened trac ticket #1163 .
10 years ago
Clément Bœsch
36952786a5
build: use pkg-config to detect libmodplug
...
Fix static build, at least for OSX.
10 years ago
Michael Niedermayer
97b88096dc
Merge commit '37c46743ee42df1d6986ba3c996e3af5b95511f7'
...
* commit '37c46743ee42df1d6986ba3c996e3af5b95511f7':
avcodec: fix missing doxygen comment marker
See: 22652dc2b8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
4250753497
avformat/mpegts: favor DESC_types over probed codecs
...
Fixes Ticket3766
Fixes dvb_teletext detection
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
37c46743ee
avcodec: fix missing doxygen comment marker
10 years ago
Reynaldo H. Verdejo Pinochet
b627385b4b
ffserver: tests, use image2 instead of pgmyuv
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Reimar Döffinger
935453102b
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>
10 years ago
Reimar Döffinger
c0d32686dd
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>
10 years ago
Reimar Döffinger
da0a670b3c
h261, h263 decoders: convert to RL_VLC.
...
Some additional optimizations in following patch.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
10 years ago
Reimar Döffinger
3efc174fd6
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>
10 years ago
Reimar Döffinger
1a558cec64
intmath.h: Remove duplicated ARM include.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
10 years ago
Michael Niedermayer
f0d4f00f24
avcodec/mjpegdec: fix green line at the bottom with upscale v
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
63a52ca134
avcodec/mjpegdec: fix green vertical line at the right with upscale h
...
Fixes Ticket3891
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Reimar Döffinger
6d7aa437e1
vf_drawtext: move "static const" before "struct".
...
This is consistent with all other occurrences.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
10 years ago
Reimar Döffinger
2ca7edda89
lavu/hash.c: Add missing "static const".
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
10 years ago
Reimar Döffinger
03bf457241
Add av_cold to table generation functions.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
10 years ago
Reimar Döffinger
4fe448738e
WMA: add "const" to avoid warnings with hardcoded tables.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
10 years ago
Reimar Döffinger
3bc5d2a064
ac3dec_fixed: add missing "static const".
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
10 years ago
Reimar Döffinger
c9a4ec7969
lavfi: add const/static const to pix_fmts arrays.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
10 years ago
Reimar Döffinger
18464d7270
sipr16kdata.h: add forgotten const.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
10 years ago
Reimar Döffinger
2bb66cc8be
fft_template: Move variables to where they are used.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
10 years ago
Reimar Döffinger
1654514ab0
fft: add ff_ prefix to some global arrays.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
10 years ago
Michael Niedermayer
e0237208b4
avcodec/h264: Do not get stuck on IDR inter frames
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Reimar Döffinger
8c63a0d171
xv.c: Add missing const to lookup table.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
10 years ago
Paul B Mahol
bd6f145820
avformat/dfa: use avio_feof()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
10 years ago
wm4
b173f5c155
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>
10 years ago
Reimar Döffinger
e2cd28c926
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>
10 years ago
Michael Niedermayer
ce36d80881
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>
10 years ago
Christophe Gisquet
a808733675
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>
10 years ago
Michael Niedermayer
1402873601
avcodec/vp3data: use more compact data types
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Carl Eugen Hoyos
f22c24bd7a
lavf/rtpdec_hevc: Fix compilation with -DDEBUG.
10 years ago
Carl Eugen Hoyos
494cbc4238
ffmpeg: Clean up if filter initialisation failed to avoid a memleak.
...
Fixes ticket #3858 .
Reviewed-by: Nicolas George
10 years ago
Michael Niedermayer
e16b7338d8
avcodec/aarch64/h264qpel_init_aarch64: mark src as const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
97cebf3139
avformat/udp: Move variables used only with HAVE_PTHREAD_CANCEL, under the #if
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
19bf1ed1f4
avformat/id3v2: Fix "warning: unused variable uncompressed_buffer_size" if zlib is unavailable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
0daff3ce76
avfilter/vf_mp: remove incorrect usage of AVFrame.type
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
596636a474
avcodec/snow: check coeffs for validity
...
Fixes deadlock
Fixes integer overflow
Fixes Ticket 3892
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago