aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc/examples/muxing: mark correct frame as writeableMichael Niedermayer2014-07-271-9/+9
| | | | | Bug found from comparing 56f98e340fca894a76d1ddbe33118b8d8c4db34a to HEAD Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* doc/examples/muxing: Always use swr, simplifies code slightlyMichael Niedermayer2014-07-271-6/+0
| | | | | Idea-from: 56f98e340fca894a76d1ddbe33118b8d8c4db34a Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* doc/examples/muxing: add alloc_audio_frame() and use it to simplify code.Anton Khirnov2014-07-271-29/+35
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* doc/examples/muxing: Move samples_count to OutputStreamMichael Niedermayer2014-07-271-4/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* doc/examples/muxing: free swr context at the endMichael Niedermayer2014-07-271-0/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* x86/hevc_idct: add 12bit idct_dcJames Almer2014-07-272-1/+30
| | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Reviewed-by: Mickaël Raulet <mraulet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/x86/hevcdsp_init: make license header consistentMichael Niedermayer2014-07-271-4/+4
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '1a880b2fb8456ce68eefe5902bac95fea1e6a72d'Michael Niedermayer2014-07-274-31/+35
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * hevc: SSE2 and SSSE3 loop filtersPierre Edouard Lepere2014-07-265-0/+903
| | | | | | | | | | | | | | | | 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>
* | Merge commit '73bb8f61d48dbf7237df2e9cacd037f12b84b00a'Michael Niedermayer2014-07-261-2/+3
|\| | | | | | | | | | | | | | | | | | | | | * 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>
| * hevcdsp: remove an unneeded variable in the loop filterAnton Khirnov2014-07-263-21/+19
| | | | | | | | beta0 and beta1 will always be the same
* | Merge commit '56f98e340fca894a76d1ddbe33118b8d8c4db34a'Michael Niedermayer2014-07-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * output example: convert audio to the format supported by the encoderAnton Khirnov2014-07-261-46/+147
| |
* | doc/examples/muxing: Support setting flags, for example for setting bitexactMichael Niedermayer2014-07-261-8/+19
| | | | | | | | | | | | This would allow the example to be used in regression tests Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/examples/muxing: select a supported sample rate for the encoder, favor 44100Michael Niedermayer2014-07-261-0/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/examples/muxing: pick a supported channel layout if stereo isnt ↵Michael Niedermayer2014-07-261-1/+9
| | | | | | | | | | | | supported by the encoder Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/examples/muxing: move swr context to OutputStreamMichael Niedermayer2014-07-261-14/+13
| | | | | | | | | | Idea from: 56f98e340fca894a76d1ddbe33118b8d8c4db34a Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '884f7c975f0af25febe86660e87bf3b2165a0309'Michael Niedermayer2014-07-261-2/+4
|\| | | | | | | | | | | | | | | | | | | * commit '884f7c975f0af25febe86660e87bf3b2165a0309': output example: set the stream timebase Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * output example: set the stream timebaseAnton Khirnov2014-07-261-2/+5
| | | | | | | | This is required by the new API.
* | x86/hevc_idct: replace old and unused idct functionsJames Almer2014-07-265-285/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | hevc: add support for bumping processMickaël Raulet2014-07-263-3/+52
| | | | | | | | | | | | cherry picked from commit 8aa2fb7df3cffc67a3fd03a3a7eb49dbed4094c7 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | reintroduce avpriv_dsputil_init() to maintain ABI until next soname bumpMichael Niedermayer2014-07-268-13/+159
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: replace pulse-simple with pulseLukasz Marek2014-07-261-1/+1
| | | | | | | | | | | | | | | | | | 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>
* | x86: hevc_mc: replace simple leas by addsChristophe Gisquet2014-07-261-60/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit 'd8520d3ee032bf18f28897e0109f44b405caf5e3'Michael Niedermayer2014-07-262-3/+3
|\| | | | | | | | | | | | | | | | | | | * 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>
| * mpegvideo: Move QMAT_SHIFT* defines to the only place they are usedDiego Biurrun2014-07-252-3/+3
| |
* | Merge commit '4fbb62a21bd04bf261da2382d5ba6c249c702af8'Michael Niedermayer2014-07-262-2/+3
|\| | | | | | | | | | | | | * commit '4fbb62a21bd04bf261da2382d5ba6c249c702af8': mpegvideo: Move ME_MAP_* defines to the only place they are used Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Move ME_MAP_* defines to the only place they are usedDiego Biurrun2014-07-252-2/+3
| |
* | Merge commit 'ff85334375c6733c6116ea3686f128b4a11f33e7'Michael Niedermayer2014-07-261-2/+0
|\| | | | | | | | | | | | | | | | | | | * 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>
| * mpegvideo: Drop unused MPEG_BUF_SIZE and CHROMA_444 definesDiego Biurrun2014-07-251-3/+0
| |
* | hevc: fix RAP_B_BossenMickaël Raulet2014-07-263-35/+20
| | | | | | | | | | | | cherry picked from commit 903236292f066bc321080e3e2192b64f8943d960 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/hevc: add 12bits support for MCMickaël Raulet2014-07-263-6/+155
| | | | | | | | | | | | cherry picked from commit 3fcb7a4595a6f40100a22110a5805e3b7510c0fd Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/hevc: remove unused constant in deblocking filterMickaël Raulet2014-07-261-1/+0
| | | | | | | | | | | | cherry picked from commit a3f7282eaa6f1ab0524fb966c6eade50c3025f99 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/hevc: add 12bits support for deblocking filterMickaël Raulet2014-07-262-28/+116
| | | | | | | | | | | | cherry picked from commit 97d46afe320c7d61d7b9525e5f5588355cde4bb0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mux: ignore delayed vp8/9 packets in max_interleave_delta calculationMichael Niedermayer2014-07-261-2/+8
| | | | | | | | | | | | | | | | | | 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>
* | avutil/opt: ensure the right buffer is used in set_string_number()Michael Niedermayer2014-07-251-1/+1
| | | | | | | | | | | | Fixes use of uninitialized memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '165e9df19567ec0b6abee1ee2c26027e6d7aa7bf'Michael Niedermayer2014-07-251-16/+12
|\| | | | | | | | | | | | | * commit '165e9df19567ec0b6abee1ee2c26027e6d7aa7bf': fft-test: Pass the right struct members instead of casting Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fft-test: Pass the right struct members instead of castingDiego Biurrun2014-07-251-16/+12
| |
* | RELEASE_NOTES: fix WebVTT decoder typo (-> encoder)Timothy Gu2014-07-251-1/+1
| | | | | | | | | | | | 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>
* | Merge commit '58e65e44f435243dc72dfce1f8af8afcf1319f34'Michael Niedermayer2014-07-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | * 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>
| * vc1dsp: Add wrappers for {avg|put}_vc1_mspel_mc00_cDiego Biurrun2014-07-251-2/+15
| | | | | | | | This avoids invoking the wrapped functions with too many arguments.
* | Merge commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac'Michael Niedermayer2014-07-2515-401/+460
|\| | | | | | | | | | | | | | | | | | | | | | | * 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>
| * qpeldsp: Mark source pointer in qpel_mc_func function pointer constDiego Biurrun2014-07-2515-392/+451
| |
* | Merge commit '060e4a9e0627adcda9101dd68ec7f22b4ce22b5b'Michael Niedermayer2014-07-251-1/+3
|\| | | | | | | | | | | | | | | | | * commit '060e4a9e0627adcda9101dd68ec7f22b4ce22b5b': dct/rdft: Remove duplicate typedefs for context structs See: 005e81d6cff4071847fe6e6b6de3b5d709c76de9 See: 77304cf3523cbeec56a29749fea5c21e610be644 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dct/rdft: Remove duplicate typedefs for context structsDiego Biurrun2014-07-253-5/+7
| | | | | | | | | | | | | | 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.
* | lavf/avio: do not include bprint.h.Nicolas George2014-07-252-2/+2
| | | | | | | | | | | | | | | | | | 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>
* | avformat/segment: re-interleave packets if neededMichael Niedermayer2014-07-241-1/+1
| | | | | | | | | | | | Fixes part of Ticket 3797 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mux: support re-interleaving packets in ff_write_chained()Michael Niedermayer2014-07-249-10/+12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mux: keep AVPacket fields consistent in ff_write_chained()Michael Niedermayer2014-07-241-1/+6
| | | | | | | | | | | | | | This might have caused double frees in theory, i do not have a test case though Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskaenc: print a warning when the relative timestamp wouldnt ↵Michael Niedermayer2014-07-241-1/+1
| | | | | | | | | | | | | | | | fit in 16bit This is somewhat unusual so its better to use warning level than debug Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 04:14:31 +0000