Michael Niedermayer
113229922a
Merge commit 'da7d839a0d3ec40423a665dc85e0cfaed3f92eb8'
...
* commit 'da7d839a0d3ec40423a665dc85e0cfaed3f92eb8':
ffv1dec: check that global parameters do not change in version 0/1
Conflicts:
libavcodec/ffv1dec.c
See: b05cd1ea7e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b097d1765b
Merge commit '3187fa14a326908f9471a038e3b5b24c0eaf655e'
...
* commit '3187fa14a326908f9471a038e3b5b24c0eaf655e':
hevc_mvs: avoid deriving tmvp in amvp
See: 373677f958
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
980aa2ae35
Merge commit '14ca0aa69b5d954ce56d0826ab9f1f70e535c92a'
...
* commit '14ca0aa69b5d954ce56d0826ab9f1f70e535c92a':
hevc: wait proper position for tmvp
Conflicts:
libavcodec/hevc_mvs.c
See: ed248e7f70
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
17cbc6457b
Merge commit 'cf6090dc6252f2b276aa4133e3d73a89f4c6046c'
...
* commit 'cf6090dc6252f2b276aa4133e3d73a89f4c6046c':
hevc: use intreadwrite
Conflicts:
libavcodec/hevc_mvs.c
See: 7a4a5515b0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5195512add
Merge commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc'
...
* commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc':
hevc: derive partial merge list
Conflicts:
libavcodec/hevc_mvs.c
See: 4576eff05d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
cde2de4a05
Merge commit '3505b19652ea34089a4cd08d4d3358fcc0a3db8b'
...
* commit '3505b19652ea34089a4cd08d4d3358fcc0a3db8b':
hevc: derive partially amvp list
Conflicts:
libavcodec/hevc_mvs.c
See: bbeaae96eb
See: 3ad0460831
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e6ffe7bcfc
Merge commit '09182b3224370e1d636631e77f201a8388766bd6'
...
* commit '09182b3224370e1d636631e77f201a8388766bd6':
hevc: simplify rounding
Conflicts:
libavcodec/hevc_mvs.c
See: 2e471e4703
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2278146a0c
Merge commit 'd1b1c3bb5ef1bee409c06c3bcacfb8674e1cb574'
...
* commit 'd1b1c3bb5ef1bee409c06c3bcacfb8674e1cb574':
hevc: reorder loops
Conflicts:
libavcodec/hevc.c
See: eca1957c4c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Carl Eugen Hoyos
b703322059
Remove useless configure option "--enable-sram".
11 years ago
Ronald S. Bultje
45bed0ab30
vp9/x86: fix bug in intra_pred_hd_32x32.
...
Fixes mismatch in first keyframe in sample
ffvp9_fails_where_libvpx.succeeds.webm from ticket 3849. There's still
a second mismatch a few frames into the sample.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
c97870d1a1
x86/dca: remove unused header
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
e20ff251a6
x86/ttadsp: remove an unnecessary mova
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
da7d839a0d
ffv1dec: check that global parameters do not change in version 0/1
...
Such changes are neither allowed nor supported
Found-by: ami_stuff
Bug-Id: CVE-2013-7020
CC: libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Christophe Gisquet
3187fa14a3
hevc_mvs: avoid deriving tmvp in amvp
...
Reduces the number of calls to tmvp derivation from 933685 to 586271 on
a sequence.
Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Christophe Gisquet
14ca0aa69b
hevc: wait proper position for tmvp
...
The position is either rounded or not checked, so delay the wait to
check the proper value.
Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Christophe Gisquet
cf6090dc62
hevc: use intreadwrite
...
When dealing with MVs, both components may be processed at a time.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Christophe Gisquet
ed53cc217f
hevc: derive partial merge list
...
The merge list only needs to be derived up to the merge index.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Christophe Gisquet
3505b19652
hevc: derive partially amvp list
...
When the candidate has been found, no need to derive others.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Christophe Gisquet
09182b3224
hevc: simplify rounding
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Christophe Gisquet
d1b1c3bb5e
hevc: reorder loops
...
iterate over memory in a more continuous order
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Martin Storsjö
223c374a9d
configure: Check for nanosleep in headers as well, not only in libs
...
On mingw64 with c++11 support, the link libraries do contain a
nanosleep function, while it isn't exposed via the headers. Using
check_func_headers instead of a plain check_func fixes this
misdetection.
Suggested-by: Hendrik Leppkes <h.leppkes@gmail.com>
See: [FFmpeg-devel] [PATCH] fix: 'make' with mingw32
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Carl Eugen Hoyos
99867fc0c4
Fix warning if https protocol was requested but isn't available.
11 years ago
Carl Eugen Hoyos
fddea3f074
Check for hevc startcode when muxing into mpeg-ts.
11 years ago
James Almer
d6711ee648
lavu: stop exporting internal functions
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
744f15b6b3
lavu: rename ff_opencl_set_parameter() to avpriv_opencl_set_parameter()
...
It was wrongly being exported and used by libavfilter.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Daniel Oberhoff
9f617a14a0
avfilter: ported lenscorrection filter from frei0r
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Christophe Gisquet
52b81ff463
proresenc_kostya: report buffer overflow
...
If the allocated size, despite best efforts, is too small, exit
with the appropriate error.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Christophe Gisquet
bf10f09bcc
proresenc_kostya: remove unneeded parameters
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Reimar Döffinger
2c0454cd20
Add missing initialization for AVProbeData.
...
This has become necessary since the new mime field was added.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
11 years ago
Michael Niedermayer
9a162146ca
avcodec/snow: fix null pointer dereference in cleanup after allocation failure
...
Fixes: snowf.avi
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ba47d519e5
avcodec/huffyuvdec: fix overread checks
...
Fixes: ffvhuff_f.avi
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
11512d70fa
avcodec/get_bits: add BITS_LEFT() for finding the bits left with an opened reader
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
7b3de03c8f
lavf: stop exporting internal functions
...
Except for those currently used by ffserver.
Signed-off-by: James Almer <jamrial@gmail.com>
Also left some others that seemed used by applications other than ffserver
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
31b7ab9f06
lavf/mpegts: remove obsolete ff_mpegts_parse_* cruft
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
59ecd4882d
lavc/raw: remove obsolete ff_raw_pix_fmt_tags cruft
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
8f2634f970
lavc: stop exporting internal functions and tables
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
9eda4e8bd7
avcodec/idctdsp: move add/put_pixels_clamped_c to header
...
This allows sharing them with the xvid IDCT
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Christophe Gisquet
5ec85c9750
hevc: do generic validation of bitstream
...
After finishing parsing VPS/SPS/PPS/slice header, check remaining bits,
and if an overconsumption occurred, report invalid data.
Liked-by: BBB
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Ronald S. Bultje
bfffce4d08
hevc: add missing comma in log message.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6801eb0a09
avcodec/vc1dec: do not crash when flushing without an allocated frame
...
Fixes Ticket3837
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f4e814f787
swresample: check av_opt_set for failure in swr_alloc_set_opts()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Luca Barbato
c4ac48c5a1
swresample: document the need to configure the context using AVOptions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
49456a95eb
avformat/movenc: Fix printf type
...
Found-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
7727345613
Merge commit '08b94f160a2c966bb83e32bde0e52246fafa2155'
...
* commit '08b94f160a2c966bb83e32bde0e52246fafa2155':
configure: Don't pass MSVC compiler options -M[TD] to armasm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d177f27517
Merge commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94'
...
* commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94':
avcodec: Postpone FF_IDCT_XVIDMMX removal until the next version bump
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Carl Eugen Hoyos
788cf6f0c6
Remove panscan information in av_frame_copy_props() if resolution changes.
...
Fixes ticket #3750 .
11 years ago
Michael Niedermayer
3539d6c63a
avcodec/iff: check pixfmt for rgb8 / rgbn
...
Fixes out of array access
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
9bcdb98839
avcodec/iff: Factorize av_pix_fmt_desc_get() out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Mark Reid
cab39afb1a
avformat/movenc: check that reel_name length doesn't exceed UINT16_MAX
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
bd87965247
Merge commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e'
...
* commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e':
lavc: drop the av_fast_{re,m}alloc compatibility wrappers
Conflicts:
libavcodec/utils.c
See: a973e01501
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago