Michael Niedermayer
7295ee7f51
Merge commit 'd8520d3ee032bf18f28897e0109f44b405caf5e3'
...
* commit 'd8520d3ee032bf18f28897e0109f44b405caf5e3':
mpegvideo: Move QMAT_SHIFT* defines to the only place they are used
Conflicts:
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
8b395315a5
Merge commit '4fbb62a21bd04bf261da2382d5ba6c249c702af8'
...
* commit '4fbb62a21bd04bf261da2382d5ba6c249c702af8':
mpegvideo: Move ME_MAP_* defines to the only place they are used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
0a9bab5be6
Merge commit 'ff85334375c6733c6116ea3686f128b4a11f33e7'
...
* commit 'ff85334375c6733c6116ea3686f128b4a11f33e7':
mpegvideo: Drop unused MPEG_BUF_SIZE and CHROMA_444 defines
CHROMA_444 is not removed as we do support CHROMA_444 and use the
identifier
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Mickaël Raulet
f6e218a02d
hevc: fix RAP_B_Bossen
...
cherry picked from commit 903236292f066bc321080e3e2192b64f8943d960
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Mickaël Raulet
bd0f2d316f
x86/hevc: add 12bits support for MC
...
cherry picked from commit 3fcb7a4595a6f40100a22110a5805e3b7510c0fd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Mickaël Raulet
7df98d8c4d
x86/hevc: remove unused constant in deblocking filter
...
cherry picked from commit a3f7282eaa6f1ab0524fb966c6eade50c3025f99
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Mickaël Raulet
7bdcf5c934
x86/hevc: add 12bits support for deblocking filter
...
cherry picked from commit 97d46afe320c7d61d7b9525e5f5588355cde4bb0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
a06fac353c
avformat/mux: ignore delayed vp8/9 packets in max_interleave_delta calculation
...
libvpx adds very significant delay, which appears normal and we must
buffer all other streams no matter what to interleave them correctly
Fixes Ticket3440
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
24327706e1
avutil/opt: ensure the right buffer is used in set_string_number()
...
Fixes use of uninitialized memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Diego Biurrun
d8520d3ee0
mpegvideo: Move QMAT_SHIFT* defines to the only place they are used
10 years ago
Diego Biurrun
4fbb62a21b
mpegvideo: Move ME_MAP_* defines to the only place they are used
10 years ago
Diego Biurrun
ff85334375
mpegvideo: Drop unused MPEG_BUF_SIZE and CHROMA_444 defines
10 years ago
Michael Niedermayer
aadf5222da
Merge commit '165e9df19567ec0b6abee1ee2c26027e6d7aa7bf'
...
* commit '165e9df19567ec0b6abee1ee2c26027e6d7aa7bf':
fft-test: Pass the right struct members instead of casting
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Diego Biurrun
165e9df195
fft-test: Pass the right struct members instead of casting
10 years ago
Timothy Gu
065fa66872
RELEASE_NOTES: fix WebVTT decoder typo (-> encoder)
...
Found-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
859413b66d
Merge commit '58e65e44f435243dc72dfce1f8af8afcf1319f34'
...
* commit '58e65e44f435243dc72dfce1f8af8afcf1319f34':
vc1dsp: Add wrappers for {avg|put}_vc1_mspel_mc00_c
Conflicts:
libavcodec/vc1dsp.c
See: 319235c67c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
2904d052b7
Merge commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac'
...
* commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac':
qpeldsp: Mark source pointer in qpel_mc_func function pointer const
Conflicts:
libavcodec/h264qpel_template.c
libavcodec/x86/cavsdsp.c
libavcodec/x86/rv40dsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
937eaba2a1
Merge commit '060e4a9e0627adcda9101dd68ec7f22b4ce22b5b'
...
* commit '060e4a9e0627adcda9101dd68ec7f22b4ce22b5b':
dct/rdft: Remove duplicate typedefs for context structs
See: 005e81d6cf
See: 77304cf352
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Diego Biurrun
58e65e44f4
vc1dsp: Add wrappers for {avg|put}_vc1_mspel_mc00_c
...
This avoids invoking the wrapped functions with too many arguments.
10 years ago
Diego Biurrun
7fb993d338
qpeldsp: Mark source pointer in qpel_mc_func function pointer const
10 years ago
Diego Biurrun
060e4a9e06
dct/rdft: Remove duplicate typedefs for context structs
...
The typedefs also exist in the avfft.h header and since typedefs cannot be
legally redefined in C, the code fails to compile with some compilers.
This reverts commits 11c7155cce
and 57f1b1dcc7
.
10 years ago
Nicolas George
04bc370072
lavf/avio: do not include bprint.h.
...
C++ chokes on the definition of AVBPrint.
Including avio.h from c++ code used to work.
Fix trac ticket #3800 .
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
66ae994c54
avformat/segment: re-interleave packets if needed
...
Fixes part of Ticket 3797
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
351b22caae
avformat/mux: support re-interleaving packets in ff_write_chained()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
383a04a127
avformat/mux: keep AVPacket fields consistent in ff_write_chained()
...
This might have caused double frees in theory, i do not have a test case
though
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
d44b8f0a47
avformat/matroskaenc: print a warning when the relative timestamp wouldnt fit in 16bit
...
This is somewhat unusual so its better to use warning level than debug
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
ce8e27e0ed
Merge commit '436ced244fadcde2c0b925627920e84b25482542'
...
* commit '436ced244fadcde2c0b925627920e84b25482542':
mpegenccontext: Remove unused opaque pointer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
7923aa0fba
avformat/matroskaenc: Start new cluster if relative timestamp could not otherwise be stored
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
3c6e220a8c
avformat/matroskaenc: Factor mkv_start_new_cluster() out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Nidhi Makhijani
436ced244f
mpegenccontext: Remove unused opaque pointer
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
10 years ago
Michael Niedermayer
183bbc2af1
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Ignore xing number of frames if the file is larger than indicated.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Timothy Gu
c508adb223
hevc: propagate error code from set_sps()
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Carl Eugen Hoyos
ef21b3d38e
Ignore xing number of frames if the file is larger than indicated.
...
Fixes ticket #3777 .
10 years ago
Carl Eugen Hoyos
badcd3da81
Print a warning instead of requesting a sample for an invalid exif tag.
...
Fixes ticket #3792 .
Reviewed-by: Thilo Borgmann
10 years ago
Lukasz Marek
f753956252
lavfi/src_movie: minor simplifications
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Lukasz Marek
9739255365
lavfi/src_movie: remove frame from priv context
...
This variable is used only inside one function.
There is no need to store it in context.
This also may prevent crush by double free frame.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
8b59ab1af0
Merge commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785'
...
* commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785':
http: K&R formatting cosmetics
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
ab0f78ea77
Merge commit 'd0de7330b973b354e2ceb0b99fd545b868b0a9c4'
...
* commit 'd0de7330b973b354e2ceb0b99fd545b868b0a9c4':
fft-test: Pass correct struct members to (i)dct functions
Conflicts:
libavcodec/fft-test.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
02ea384abd
Merge commit '6133d65861f265d429ade53e910fe877c95a1615'
...
* commit '6133d65861f265d429ade53e910fe877c95a1615':
fft-test: K&R formatting cosmetics
Conflicts:
libavcodec/fft-test.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
629e5e28f7
avcodec/fft-test: fix memory alloc checks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
074bb7515e
Merge commit 'c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9'
...
* commit 'c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9':
fft-test: Check memory allocations
Conflicts:
libavcodec/fft-test.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Diego Biurrun
ce2e858f5b
http: K&R formatting cosmetics
...
Also comment some #endifs and reshuffle headers into canonical order.
10 years ago
Christophe Gisquet
670b7f203a
x86: hevcdsp: align
...
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Diego Biurrun
d0de7330b9
fft-test: Pass correct struct members to (i)dct functions
...
This fixes a number of incompatible pointer type warnings.
10 years ago
Diego Biurrun
6133d65861
fft-test: K&R formatting cosmetics
...
Also rearrange #includes into canonical order.
10 years ago
Christophe Gisquet
373677f958
hevc_mvs: avoid deriving tmvp in amvp
...
Reduces on a sequence number of calls from 933685 to 586271.
Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Christophe Gisquet
ca081217cd
hevcdsp: change types of SAO parameters
...
From openhevc
Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
088875b6b8
Merge commit '7288b345850792430302a8f85a4b29140b770497'
...
* commit '7288b345850792430302a8f85a4b29140b770497':
fft-test: Drop unnecessary pointer indirection for context structs
Conflicts:
libavcodec/fft-test.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
09f5b3750f
Merge commit 'd445c865f87e7f13230e4dac3f77f5af21da95cb'
...
* commit 'd445c865f87e7f13230e4dac3f77f5af21da95cb':
fft-test: Reduce variable scope where sensibly possible
Conflicts:
libavcodec/fft-test.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
97d2b8d6f5
Merge commit 'eac77fcd56fc2a3391f0d86faf54302afb368ff7'
...
* commit 'eac77fcd56fc2a3391f0d86faf54302afb368ff7':
mpegenccontext: Remove unused dct_unquantize_h261 function pointers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago