aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* swr-test: fix declaration statement ordering.Michael Niedermayer2012-04-261-2/+2
| | | | | | swr-test is now warning free. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr-test: fix pointer type warningsMichael Niedermayer2012-04-261-10/+10
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr-test: fix unused var warningsMichael Niedermayer2012-04-261-4/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr-test:indentMichael Niedermayer2012-04-261-112/+112
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-2617-2064/+1493
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dsputil: fix invalid array indexing configure: add libavresample to rpath build: icc: silence some warnings fft-test: add option to set cpuflag mask cpu: recognise only cpu flag names pertinent to the architecture avutil: add av_parse_cpu_flags() function vp8: armv6: fix non-armv6t2 build vp8: armv6 optimisations vp8: arm: separate ARMv6 functions from NEON ARM: add some compatibility macros mov: support eac3 audio avf: fix faulty check in has_duration Conflicts: configure doc/APIchanges ffmpeg.c libavcodec/arm/Makefile libavcodec/arm/asm.S libavcodec/arm/vp8dsp_armv6.S libavcodec/arm/vp8dsp_init_arm.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: fix invalid array indexingMans Rullgard2012-04-261-6/+10
| | | | | | | | | | | | | | Indexing outside an array is invalid and causes errors with gcc 4.8. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * configure: add libavresample to rpathSean McGovern2012-04-261-1/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * build: icc: silence some warningsMans Rullgard2012-04-251-1/+2
| | | | | | | | | | | | | | | | | | This disables the warning "external declaration in primary source file" which is issued when a prototype for an extern function is found in a .c file rather than a header file. We have such prototypes for asm functions where a separate header file would be pointless. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * fft-test: add option to set cpuflag maskMans Rullgard2012-04-252-13/+23
| | | | | | | | | | | | This can be useful for testing. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * cpu: recognise only cpu flag names pertinent to the architectureMans Rullgard2012-04-251-2/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * avutil: add av_parse_cpu_flags() functionMans Rullgard2012-04-255-56/+77
| | | | | | | | | | | | | | This moves the cpu flag parsing code from avconv to avutil so it can be accessed elsewhere. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * vp8: armv6: fix non-armv6t2 buildMans Rullgard2012-04-251-0/+2
| | | | | | | | | | | | | | | | The assembler may fail to place literal pools close enough to instructions referencing them. An explicit .ltorg directive fixes this. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * vp8: armv6 optimisationsMans Rullgard2012-04-252-1/+1658
| | | | | | | | | | | | | | Based on patch by Ronald S. Bultje <rsbultje@gmail.com>, partially ported from libvpx. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * vp8: arm: separate ARMv6 functions from NEONMans Rullgard2012-04-257-170/+289
| | | | | | | | | | | | This is a preparation for complete ARMv6 optimisations. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * ARM: add some compatibility macrosMans Rullgard2012-04-251-0/+19
| | | | | | | | | | | | This adds some macros simplifying Thumb and pre-v6T2 compatibility. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mov: support eac3 audioHendrik Leppkes2012-04-251-0/+1
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * avf: fix faulty check in has_durationLuca Barbato2012-04-251-1/+1
| | | | | | | | An invalid duration is AV_NOPTS_VALUE not 0.
* | swr-test: support fabrices audiogen like avrMichael Niedermayer2012-04-261-0/+83
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr-test: fix u8 zero point.Michael Niedermayer2012-04-261-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr-test: improve rounding in set()Michael Niedermayer2012-04-261-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | af_amerge: return errors from subfilters when requesting a frameMatthieu Bouron2012-04-261-2/+3
| |
* | swr-test: remove unneeded hack to test planar formats.Michael Niedermayer2012-04-261-15/+15
| | | | | | | | | | | | planar formats are now chosen like any other parameter. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr-test: improve outputMichael Niedermayer2012-04-261-6/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr-test: print channel layout, instead of just channel countsMichael Niedermayer2012-04-261-2/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr-test: Use randomized collision free hypercube corner enumeration to ↵Michael Niedermayer2012-04-261-14/+40
| | | | | | | | | | | | | | | | | | select tests. This way the user can specify how many or few tests should run while still providing good coverage over the whole parameter set. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr-test: use formats arrayMichael Niedermayer2012-04-261-2/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr-test: remove 0 terminator in layouts for consistencyMichael Niedermayer2012-04-261-3/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr-test: add rates tables containing a new set of sample rates.Michael Niedermayer2012-04-261-3/+11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr-test: indentMichael Niedermayer2012-04-261-14/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr-test: add sorted formats table from avrMichael Niedermayer2012-04-261-0/+13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1: add examples of supported slices countsMichael Niedermayer2012-04-261-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: pass resample parameters from the user to the resampler.Michael Niedermayer2012-04-262-1/+9
| | | | | | | | | | | | doxy and names stolen from avr Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: Add longer more descriptive alternative AVOptions.Michael Niedermayer2012-04-261-2/+15
| | | | | | | | | | | | They match avresample where it supports the same fields. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: Capitalize help texts for AVOptionsMichael Niedermayer2012-04-261-20/+19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: align options a littleMichael Niedermayer2012-04-261-23/+21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: set AV_OPT_FLAG_AUDIO_PARAM for the AVOptionsMichael Niedermayer2012-04-261-23/+25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-2533-27/+3875
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: FATE: use updated reference for aac-latm_stereo_to_51 avconv: use libavresample Add libavresample FATE: avoid channel mixing in lavf-dv_fmt Conflicts: Changelog Makefile cmdutils.c configure doc/APIchanges ffmpeg.c tests/lavf-regression.sh tests/ref/lavf/dv_fmt tests/ref/seek/lavf_dv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * FATE: use updated reference for aac-latm_stereo_to_51Justin Ruggles2012-04-241-2/+2
| | | | | | | | This uses correct stereo to 5.1 upmixing via libavresample.
| * avconv: use libavresampleJustin Ruggles2012-04-242-72/+68
| |
| * Add libavresampleJustin Ruggles2012-04-2427-8/+3838
| | | | | | | | | | This is a new library for audio sample format, channel layout, and sample rate conversion.
| * FATE: avoid channel mixing in lavf-dv_fmtJustin Ruggles2012-04-243-17/+17
| | | | | | | | | | | | | | This partially reverts acb1730218f1c614dc8ca3ba45d9de1e05059515 which would only have needed to change the checksums if channel mixing had been properly avoided. This changes the output file size reference and the seek test reference back to the previous values.
* | ffv1: remove clear_state(), it has become unusedMichael Niedermayer2012-04-251-9/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1: move clear_state() to clear_slice_state() in encoding threadsMichael Niedermayer2012-04-251-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1: indentMichael Niedermayer2012-04-251-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1: move init_slice_state() into the decoder threads.Michael Niedermayer2012-04-251-12/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1: Remove slice count field with 1.3 and just count slices.Michael Niedermayer2012-04-251-6/+15
| | | | | | | | | | | | | | This field was problematic because in case of damaged slices it can be lost Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1: store slice size with all slices in 1.3Michael Niedermayer2012-04-251-3/+3
| | | | | | | | | | | | | | This simplifies handling by removing a special case. Its also needed to make the next change possible. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1: add 1 status byte to slices in in case crcs are stored too.Michael Niedermayer2012-04-251-2/+4
| | | | | | | | | | | | | | This will allow storing of information about corrected and uncorrectable errors. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1: Always store slice size when error reobustness is enabled.Michael Niedermayer2012-04-251-3/+3
| | | | | | | | | | | | This simplifies finding slices within a damaged bitstream. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1: include solution hint in the slice error messageMichael Niedermayer2012-04-251-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>