]>
git.sesse.net Git - ffmpeg/log
Mickaël Raulet [Fri, 25 Jul 2014 14:57:40 +0000 (16:57 +0200)]
fate/hevc: add BUMPING bitstream test
cherry picked from commit
d4d61a071f087db2a4bc2b49559d40dd350a841e
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 27 Jul 2014 00:16:04 +0000 (02:16 +0200)]
Merge commit '
7215fcf84032118ecd9fb54fb14154d69fea638d '
* commit '
7215fcf84032118ecd9fb54fb14154d69fea638d ':
avformat: Mark AVOutputFormat argument in avformat_query_codec as const
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 27 Jul 2014 00:09:41 +0000 (02:09 +0200)]
Merge commit '
ec4f04da1a3462dac429b9d15dee5f027309da15 '
* commit '
ec4f04da1a3462dac429b9d15dee5f027309da15 ':
avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const
Conflicts:
libavformat/format.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 Jul 2014 23:57:34 +0000 (01:57 +0200)]
Merge commit '
53abe32409f13687c864b3cda077a1aa906a2459 '
* commit '
53abe32409f13687c864b3cda077a1aa906a2459 ':
avcodec: Mark argument in av_{parser|hwaccel|bitstream_filter}_next as const
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 Jul 2014 23:35:10 +0000 (01:35 +0200)]
doc/examples/muxing: mark correct frame as writeable
Bug found from comparing
56f98e340fca894a76d1ddbe33118b8d8c4db34a to HEAD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 Jul 2014 23:32:19 +0000 (01:32 +0200)]
doc/examples/muxing: Always use swr, simplifies code slightly
Idea-from:
56f98e340fca894a76d1ddbe33118b8d8c4db34a
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sat, 26 Jul 2014 23:12:25 +0000 (01:12 +0200)]
doc/examples/muxing: add alloc_audio_frame() and use it to simplify code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 Jul 2014 23:05:05 +0000 (01:05 +0200)]
doc/examples/muxing: Move samples_count to OutputStream
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 Jul 2014 22:50:58 +0000 (00:50 +0200)]
doc/examples/muxing: free swr context at the end
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 26 Jul 2014 18:08:51 +0000 (15:08 -0300)]
x86/hevc_idct: add 12bit idct_dc
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 Jul 2014 22:28:44 +0000 (00:28 +0200)]
avcodec/x86/hevcdsp_init: make license header consistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 Jul 2014 22:19:25 +0000 (00:19 +0200)]
Merge commit '
1a880b2fb8456ce68eefe5902bac95fea1e6a72d '
* commit '
1a880b2fb8456ce68eefe5902bac95fea1e6a72d ':
hevc: SSE2 and SSSE3 loop filters
Conflicts:
libavcodec/hevcdsp.c
libavcodec/hevcdsp.h
libavcodec/x86/Makefile
libavcodec/x86/hevc_deblock.asm
libavcodec/x86/hevcdsp_init.c
See:
de7b89fd43f850d77cf24ad6ae50185dfe391e91 and several others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 Jul 2014 21:51:43 +0000 (23:51 +0200)]
Merge commit '
73bb8f61d48dbf7237df2e9cacd037f12b84b00a '
* commit '
73bb8f61d48dbf7237df2e9cacd037f12b84b00a ':
hevcdsp: remove an unneeded variable in the loop filter
Conflicts:
libavcodec/hevc_filter.c
See:
d7e162d46b4a0fc03ca5161cdcac840152f048cb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sat, 26 Jul 2014 09:50:59 +0000 (02:50 -0700)]
avformat: Mark AVOutputFormat argument in avformat_query_codec as const
Diego Biurrun [Sat, 26 Jul 2014 09:47:41 +0000 (02:47 -0700)]
avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const
Diego Biurrun [Sat, 26 Jul 2014 09:46:40 +0000 (02:46 -0700)]
avcodec: Mark argument in av_{parser|hwaccel|bitstream_filter}_next as const
Michael Niedermayer [Sat, 26 Jul 2014 21:28:36 +0000 (23:28 +0200)]
Merge commit '
56f98e340fca894a76d1ddbe33118b8d8c4db34a '
* commit '
56f98e340fca894a76d1ddbe33118b8d8c4db34a ':
output example: convert audio to the format supported by the encoder
Conflicts:
doc/examples/muxing.c
Not merged as our example code already does that for what is needed
and we generate matching data for the rest. generating fixed data
and converting all parameters could be done of course.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 Jul 2014 20:46:34 +0000 (22:46 +0200)]
doc/examples/muxing: Support setting flags, for example for setting bitexact
This would allow the example to be used in regression tests
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 Jul 2014 20:19:10 +0000 (22:19 +0200)]
doc/examples/muxing: select a supported sample rate for the encoder, favor 44100
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 Jul 2014 20:00:07 +0000 (22:00 +0200)]
doc/examples/muxing: pick a supported channel layout if stereo isnt supported by the encoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 Jul 2014 19:42:46 +0000 (21:42 +0200)]
doc/examples/muxing: move swr context to OutputStream
Idea from:
56f98e340fca894a76d1ddbe33118b8d8c4db34a
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 Jul 2014 19:04:31 +0000 (21:04 +0200)]
Merge commit '
884f7c975f0af25febe86660e87bf3b2165a0309 '
* commit '
884f7c975f0af25febe86660e87bf3b2165a0309 ':
output example: set the stream timebase
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 26 Jul 2014 07:47:14 +0000 (04:47 -0300)]
x86/hevc_idct: replace old and unused idct functions
Only 8-bit and 10-bit idct_dc() functions are included (adding others should be trivial).
Benchmarks on an Intel Core i5-4200U:
idct8x8_dc
SSE2 MMXEXT C
cycles 22 26 57
idct16x16_dc
AVX2 SSE2 C
cycles 27 32 249
idct32x32_dc
AVX2 SSE2 C
cycles 62 126 1375
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Pierre Edouard Lepere [Wed, 18 Jun 2014 03:57:16 +0000 (05:57 +0200)]
hevc: SSE2 and SSSE3 loop filters
Additional contributions by James Almer <jamrial@gmail.com>,
Carl Eugen Hoyos <cehoyos@ag.or.at>, Fiona Glaser <fiona@x264.com> and
Anton Khirnov <anton@khirnov.net>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Sat, 12 Jul 2014 08:36:03 +0000 (08:36 +0000)]
hevcdsp: remove an unneeded variable in the loop filter
beta0 and beta1 will always be the same
Anton Khirnov [Thu, 24 Jul 2014 17:47:26 +0000 (17:47 +0000)]
output example: convert audio to the format supported by the encoder
Anton Khirnov [Wed, 23 Jul 2014 11:09:16 +0000 (11:09 +0000)]
output example: set the stream timebase
This is required by the new API.
Mickaël Raulet [Sat, 26 Jul 2014 12:27:56 +0000 (14:27 +0200)]
hevc: add support for bumping process
cherry picked from commit
8aa2fb7df3cffc67a3fd03a3a7eb49dbed4094c7
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 25 Jul 2014 19:56:13 +0000 (21:56 +0200)]
reintroduce avpriv_dsputil_init() to maintain ABI until next soname bump
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sat, 26 Jul 2014 01:38:27 +0000 (03:38 +0200)]
configure: replace pulse-simple with pulse
pulse-simple is additional library built on top of PulseAudio.
It causes ffmpeg to link to library which is not needed anymore.
This commit removes that redundant dependency.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Thu, 24 Jul 2014 15:23:47 +0000 (17:23 +0200)]
x86: hevc_mc: replace simple leas by adds
lea is detrimental for those simple cases. No impact overall to
the change though.
Before:
15017 decicycles in q,
1016152 runs, 32424 skips
15382 decicycles in q_bi,
1013673 runs, 34903 skips
3713 decicycles in e,
2074534 runs, 22618 skips
3901 decicycles in e_bi,
2065509 runs, 31643 skips
7852 decicycles in q_uni, 520165 runs, 4123 skips
2398 decicycles in e_uni,
1043339 runs, 5237 skips
After:
14898 decicycles in q,
1016295 runs, 32281 skips
15119 decicycles in q_bi,
1015392 runs, 33184 skips
3682 decicycles in e,
2073224 runs, 23928 skips
3720 decicycles in e_bi,
2065043 runs, 32109 skips
7643 decicycles in q_uni, 520280 runs, 4008 skips
2363 decicycles in e_uni,
1043780 runs, 4796 skips
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 Jul 2014 00:47:04 +0000 (02:47 +0200)]
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>
Michael Niedermayer [Sat, 26 Jul 2014 00:34:47 +0000 (02:34 +0200)]
Merge commit '
4fbb62a21bd04bf261da2382d5ba6c249c702af8 '
* commit '
4fbb62a21bd04bf261da2382d5ba6c249c702af8 ':
mpegvideo: Move ME_MAP_* defines to the only place they are used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 26 Jul 2014 00:17:05 +0000 (02:17 +0200)]
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>
Mickaël Raulet [Fri, 25 Jul 2014 14:37:39 +0000 (16:37 +0200)]
hevc: fix RAP_B_Bossen
cherry picked from commit
903236292f066bc321080e3e2192b64f8943d960
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mickaël Raulet [Fri, 25 Jul 2014 16:55:23 +0000 (18:55 +0200)]
x86/hevc: add 12bits support for MC
cherry picked from commit
3fcb7a4595a6f40100a22110a5805e3b7510c0fd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mickaël Raulet [Fri, 25 Jul 2014 16:02:46 +0000 (18:02 +0200)]
x86/hevc: remove unused constant in deblocking filter
cherry picked from commit
a3f7282eaa6f1ab0524fb966c6eade50c3025f99
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mickaël Raulet [Fri, 25 Jul 2014 15:55:40 +0000 (17:55 +0200)]
x86/hevc: add 12bits support for deblocking filter
cherry picked from commit
97d46afe320c7d61d7b9525e5f5588355cde4bb0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 25 Jul 2014 22:56:32 +0000 (00:56 +0200)]
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>
Michael Niedermayer [Fri, 25 Jul 2014 19:29:43 +0000 (21:29 +0200)]
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>
Diego Biurrun [Wed, 23 Jul 2014 20:53:54 +0000 (13:53 -0700)]
mpegvideo: Move QMAT_SHIFT* defines to the only place they are used
Diego Biurrun [Wed, 23 Jul 2014 20:50:35 +0000 (13:50 -0700)]
mpegvideo: Move ME_MAP_* defines to the only place they are used
Diego Biurrun [Wed, 23 Jul 2014 20:49:16 +0000 (13:49 -0700)]
mpegvideo: Drop unused MPEG_BUF_SIZE and CHROMA_444 defines
Michael Niedermayer [Fri, 25 Jul 2014 18:42:07 +0000 (20:42 +0200)]
Merge commit '
165e9df19567ec0b6abee1ee2c26027e6d7aa7bf '
* commit '
165e9df19567ec0b6abee1ee2c26027e6d7aa7bf ':
fft-test: Pass the right struct members instead of casting
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 23 Jul 2014 20:38:35 +0000 (13:38 -0700)]
fft-test: Pass the right struct members instead of casting
Timothy Gu [Fri, 25 Jul 2014 02:39:36 +0000 (19:39 -0700)]
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>
Michael Niedermayer [Fri, 25 Jul 2014 11:11:23 +0000 (13:11 +0200)]
Merge commit '
58e65e44f435243dc72dfce1f8af8afcf1319f34 '
* commit '
58e65e44f435243dc72dfce1f8af8afcf1319f34 ':
vc1dsp: Add wrappers for {avg|put}_vc1_mspel_mc00_c
Conflicts:
libavcodec/vc1dsp.c
See:
319235c67c59d6abaa78d5af57121ab9816f937d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 25 Jul 2014 10:58:03 +0000 (12:58 +0200)]
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>
Michael Niedermayer [Fri, 25 Jul 2014 10:35:55 +0000 (12:35 +0200)]
Diego Biurrun [Thu, 24 Jul 2014 23:22:44 +0000 (16:22 -0700)]
vc1dsp: Add wrappers for {avg|put}_vc1_mspel_mc00_c
This avoids invoking the wrapped functions with too many arguments.
Diego Biurrun [Thu, 24 Jul 2014 23:19:45 +0000 (16:19 -0700)]
qpeldsp: Mark source pointer in qpel_mc_func function pointer const
Diego Biurrun [Wed, 23 Jul 2014 14:36:19 +0000 (07:36 -0700)]
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 .
Nicolas George [Thu, 24 Jul 2014 07:34:10 +0000 (09:34 +0200)]
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>
Michael Niedermayer [Thu, 24 Jul 2014 21:22:33 +0000 (23:22 +0200)]
avformat/segment: re-interleave packets if needed
Fixes part of Ticket 3797
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 24 Jul 2014 20:39:22 +0000 (22:39 +0200)]
avformat/mux: support re-interleaving packets in ff_write_chained()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 24 Jul 2014 20:33:21 +0000 (22:33 +0200)]
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>
Michael Niedermayer [Thu, 24 Jul 2014 18:25:29 +0000 (20:25 +0200)]
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>
Michael Niedermayer [Thu, 24 Jul 2014 16:53:21 +0000 (18:53 +0200)]
Merge commit '
436ced244fadcde2c0b925627920e84b25482542 '
* commit '
436ced244fadcde2c0b925627920e84b25482542 ':
mpegenccontext: Remove unused opaque pointer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 24 Jul 2014 16:19:50 +0000 (18:19 +0200)]
avformat/matroskaenc: Start new cluster if relative timestamp could not otherwise be stored
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 24 Jul 2014 16:19:11 +0000 (18:19 +0200)]
avformat/matroskaenc: Factor mkv_start_new_cluster() out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nidhi Makhijani [Thu, 24 Jul 2014 14:52:43 +0000 (20:22 +0530)]
mpegenccontext: Remove unused opaque pointer
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Thu, 24 Jul 2014 14:50:40 +0000 (16:50 +0200)]
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>
Timothy Gu [Fri, 18 Jul 2014 01:26:44 +0000 (18:26 -0700)]
hevc: propagate error code from set_sps()
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 24 Jul 2014 13:34:36 +0000 (15:34 +0200)]
Ignore xing number of frames if the file is larger than indicated.
Fixes ticket #3777.
Carl Eugen Hoyos [Thu, 24 Jul 2014 09:58:11 +0000 (11:58 +0200)]
Print a warning instead of requesting a sample for an invalid exif tag.
Fixes ticket #3792.
Reviewed-by: Thilo Borgmann
Lukasz Marek [Sun, 11 May 2014 04:08:09 +0000 (06:08 +0200)]
lavfi/src_movie: minor simplifications
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sun, 11 May 2014 04:08:08 +0000 (06:08 +0200)]
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>
Michael Niedermayer [Thu, 24 Jul 2014 00:08:14 +0000 (02:08 +0200)]
Merge commit '
ce2e858f5b3416c2d54f7f8c14e901f75c48b785 '
* commit '
ce2e858f5b3416c2d54f7f8c14e901f75c48b785 ':
http: K&R formatting cosmetics
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 23 Jul 2014 23:50:01 +0000 (01:50 +0200)]
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>
Michael Niedermayer [Wed, 23 Jul 2014 23:22:31 +0000 (01:22 +0200)]
Merge commit '
6133d65861f265d429ade53e910fe877c95a1615 '
* commit '
6133d65861f265d429ade53e910fe877c95a1615 ':
fft-test: K&R formatting cosmetics
Conflicts:
libavcodec/fft-test.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 23 Jul 2014 22:46:15 +0000 (00:46 +0200)]
avcodec/fft-test: fix memory alloc checks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 23 Jul 2014 22:35:40 +0000 (00:35 +0200)]
Merge commit '
c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9 '
* commit '
c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9 ':
fft-test: Check memory allocations
Conflicts:
libavcodec/fft-test.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 22 Jul 2014 18:42:03 +0000 (11:42 -0700)]
http: K&R formatting cosmetics
Also comment some #endifs and reshuffle headers into canonical order.
Christophe Gisquet [Tue, 22 Jul 2014 08:57:34 +0000 (10:57 +0200)]
x86: hevcdsp: align
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 23 Jul 2014 14:33:28 +0000 (07:33 -0700)]
fft-test: Pass correct struct members to (i)dct functions
This fixes a number of incompatible pointer type warnings.
Diego Biurrun [Fri, 18 Jul 2014 12:37:11 +0000 (05:37 -0700)]
fft-test: K&R formatting cosmetics
Also rearrange #includes into canonical order.
Christophe Gisquet [Wed, 23 Jul 2014 16:27:44 +0000 (18:27 +0200)]
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>
Christophe Gisquet [Wed, 23 Jul 2014 11:39:40 +0000 (13:39 +0200)]
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>
Michael Niedermayer [Wed, 23 Jul 2014 18:48:05 +0000 (20:48 +0200)]
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>
Michael Niedermayer [Wed, 23 Jul 2014 18:40:41 +0000 (20:40 +0200)]
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>
Michael Niedermayer [Wed, 23 Jul 2014 18:20:04 +0000 (20:20 +0200)]
Merge commit '
eac77fcd56fc2a3391f0d86faf54302afb368ff7 '
* commit '
eac77fcd56fc2a3391f0d86faf54302afb368ff7 ':
mpegenccontext: Remove unused dct_unquantize_h261 function pointers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Wed, 23 Jul 2014 13:12:39 +0000 (16:12 +0300)]
lavd/lavfi: work with non-mappable files for graph_file option
Example of non-mappable file is /dev/stdin. Previously passing it as
graph_file value returned error.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Wed, 23 Jul 2014 13:12:38 +0000 (16:12 +0300)]
avio: Introduce avio_read_to_bprint(avioctx, bp, max_size)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 23 Jul 2014 15:08:56 +0000 (17:08 +0200)]
avformat/flvdec: use AV_PKT_DATA_NEW_EXTRADATA for h264 too
Fixes Ticket 3787
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 23 Jul 2014 15:39:30 +0000 (17:39 +0200)]
avcodec/h264: support AV_PKT_DATA_NEW_EXTRADATA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 23 Jul 2014 15:38:41 +0000 (17:38 +0200)]
avcodec/h264: factor is_extra() out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 21 Jul 2014 09:12:32 +0000 (02:12 -0700)]
fft-test: Check memory allocations
Diego Biurrun [Thu, 26 Jun 2014 23:14:30 +0000 (16:14 -0700)]
fft-test: Drop unnecessary pointer indirection for context structs
Diego Biurrun [Thu, 26 Jun 2014 00:35:03 +0000 (17:35 -0700)]
fft-test: Reduce variable scope where sensibly possible
Also merge variable declaration and initialization.
Michael Niedermayer [Wed, 23 Jul 2014 12:26:55 +0000 (14:26 +0200)]
Merge commit '
20ec0daaa1cdd3996ac6ed0198de961129474044 '
* commit '
20ec0daaa1cdd3996ac6ed0198de961129474044 ':
fft-test: Make global exptab variable static
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 23 Jul 2014 12:15:20 +0000 (14:15 +0200)]
Merge commit '
2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb '
* commit '
2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb ':
mpegvideo: Move QUANT_BIAS_SHIFT define to the only place it is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nidhi Makhijani [Wed, 23 Jul 2014 11:57:01 +0000 (17:27 +0530)]
mpegenccontext: Remove unused dct_unquantize_h261 function pointers
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Mon, 21 Jul 2014 08:53:16 +0000 (01:53 -0700)]
fft-test: Make global exptab variable static
Diego Biurrun [Tue, 22 Jul 2014 18:10:13 +0000 (11:10 -0700)]
mpegvideo: Move QUANT_BIAS_SHIFT define to the only place it is used
Carl Eugen Hoyos [Tue, 22 Jul 2014 22:51:29 +0000 (00:51 +0200)]
avcodec/x86/hevc_deblock: Fix compilation with nasm.
Michael Niedermayer [Wed, 23 Jul 2014 06:36:24 +0000 (08:36 +0200)]
avutil/opt: Fix parsing regression with constants starting with numbers
Fixes parsing "3dnow"
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 23 Jul 2014 00:37:26 +0000 (02:37 +0200)]
Changelog: add "version <next>:" so people dont add new things to the last release
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 22 Jul 2014 22:34:16 +0000 (00:34 +0200)]
Merge commit '
06a1d1323bc8afd03f085ae98d9b74e431b3534e '
* commit '
06a1d1323bc8afd03f085ae98d9b74e431b3534e ':
configure: Extend the neon intrinsics check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 22 Jul 2014 22:29:06 +0000 (00:29 +0200)]
Merge commit '
5be7d8597d02bcaba2de2503c0e59cf865c746dc '
* commit '
5be7d8597d02bcaba2de2503c0e59cf865c746dc ':
fft-test: Comment some #endifs
Conflicts:
libavcodec/fft-test.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 22 Jul 2014 22:23:15 +0000 (00:23 +0200)]
Merge commit '
57f1b1dcc77a93c2a5c503d4e47fe2f567cf9db5 '
* commit '
57f1b1dcc77a93c2a5c503d4e47fe2f567cf9db5 ':
fft-test: Drop unnecessary #ifdefs around header includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>