summaryrefslogtreecommitdiff
path: root/libavresample/resample_template.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '254c95cdd1b669a722204a4a65974fc2523c8f83'Michael Niedermayer2014-04-111-11/+23
|\ | | | | | | | | | | | | * commit '254c95cdd1b669a722204a4a65974fc2523c8f83': resample: split linear into its own function Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * resample: split linear into its own functionAnton Khirnov2014-04-111-11/+23
| |
* | Merge commit 'be394968c81019887ef996a78a526bdd85d1e216'Michael Niedermayer2014-04-111-8/+4
|\ \ | |/ | | | | | | | | | | * commit 'be394968c81019887ef996a78a526bdd85d1e216': resample: add initial padding explicitly Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * resample: add initial padding explicitlyAnton Khirnov2014-04-111-8/+4
| | | | | | | | | | This simplifies the code, since we do not have to deal with a possibly negative source index anymore.
* | Merge commit 'eed752d61da332fb13e9893a175a90fed7b1d7d3'Michael Niedermayer2014-04-111-2/+2
|\ \ | |/ | | | | | | | | | | * commit 'eed752d61da332fb13e9893a175a90fed7b1d7d3': resample: drop useless abs() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * resample: drop useless abs()Anton Khirnov2014-04-111-2/+2
| | | | | | | | negative sample_index is handled in the block above.
* | Merge commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5'Michael Niedermayer2014-04-111-21/+20
|\ \ | |/ | | | | | | | | | | * commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5': resample: reindent Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * resample: reindentAnton Khirnov2014-04-111-21/+20
| |
* | Merge commit 'f20892eb67a7b4b5a3c080388a35a3380516a805'Michael Niedermayer2014-04-111-5/+8
|\ \ | |/ | | | | | | | | | | * commit 'f20892eb67a7b4b5a3c080388a35a3380516a805': resample: split the nearest neighbour path into a separate function pointer Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * resample: split the nearest neighbour path into a separate function pointerAnton Khirnov2014-04-111-5/+8
| |
* | Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'Michael Niedermayer2014-03-261-0/+6
|\ \ | |/ | | | | | | | | | | * commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f': Add missing headers to make template files compile (more) standalone Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add missing headers to make template files compile (more) standaloneDiego Biurrun2014-03-261-0/+6
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-091-4/+4
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mss3: use standard zigzag table mss3: split DSP functions that are used in MTS2(MSS4) into separate file motion-test: do not use getopt() tcp: add initial timeout limit for incoming connections configure: Change the rdtsc check to a linker check avconv: propagate fatal errors from lavfi. lavfi: add error handling to filter_samples(). fate-run: make avconv() properly deal with multiple inputs. asplit: don't leak the input buffer. af_resample: fix request_frame() behavior. af_asyncts: fix request_frame() behavior. libx264: support aspect ratio switching matroskadec: honor error_recognition when encountering unknown elements. lavr: resampling: add support for s32p, fltp, and dblp internal sample formats lavr: resampling: add filter type and Kaiser window beta to AVOptions lavr: Use AV_SAMPLE_FMT_NONE to auto-select the internal sample format lavr: mix: validate internal sample format in ff_audio_mix_init() Conflicts: ffmpeg.c ffplay.c libavcodec/libx264.c libavfilter/audio.c libavfilter/split.c libavformat/tcp.c tests/fate-run.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
* lavr: resampling: add support for s32p, fltp, and dblp internal sample formatsJustin Ruggles2012-07-081-0/+102
Based partially on implementation by Michael Niedermayer <michaelni@gmx.at> in libswresample in FFmpeg. See commits: 7f1ae79d38c4edba9dbd31d7bf797e525298ac55 24ab1abfb6d55bf330022df4b10d7aec80b3f116