summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'e99af2a3b1660b4f328335149980064692097cad'Michael Niedermayer2014-03-14
|\ | | | | | | | | | | | | * commit 'e99af2a3b1660b4f328335149980064692097cad': bfin: Refactor duplicated l1_text/l1_data_B macros Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bfin: Refactor duplicated l1_text/l1_data_B macrosDiego Biurrun2014-03-13
| |
* | Merge commit 'a3e7562621bd96ce909e07149c419b6ba85cc54f'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | * commit 'a3e7562621bd96ce909e07149c419b6ba85cc54f': bfin: dsputil: K&R formatting cosmetics Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bfin: dsputil: K&R formatting cosmeticsDiego Biurrun2014-03-13
| | | | | | | | Also add a few #endif comments.
* | Merge commit '1e33095b83addd8d24bc16bd08aa734fa161d515'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | * commit '1e33095b83addd8d24bc16bd08aa734fa161d515': bfin: dsputil: Drop broken and trivial profiling code Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bfin: dsputil: Drop broken and trivial profiling codeDiego Biurrun2014-03-13
| |
* | Merge commit 'f5f099766816aab3ad805c63e85f12cb664dc9a8'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | * commit 'f5f099766816aab3ad805c63e85f12cb664dc9a8': bfin: hpeldsp: Drop broken put_pixels_*_xy2_nornd bits Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bfin: hpeldsp: Drop broken put_pixels_*_xy2_nornd bitsDiego Biurrun2014-03-13
| | | | | | | | They were marked as broken and disabled in 2009 and will never get fixed.
* | Merge commit '14efbe694ac5beff98f5c5e652c166603f1738cf'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | * commit '14efbe694ac5beff98f5c5e652c166603f1738cf': bfin: dsputil: Drop broken vsad bits Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bfin: dsputil: Drop broken vsad bitsDiego Biurrun2014-03-13
| | | | | | | | They were marked as broken and disabled in 2009 and will never get fixed.
* | Merge commit '671c8785596ea4a45817ba302289004ff456630a'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | * commit '671c8785596ea4a45817ba302289004ff456630a': bfin: dsputil: Remove unused global variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bfin: dsputil: Remove unused global variableDiego Biurrun2014-03-13
| |
* | Merge commit 'db3f61a04f1f66746660f921bb2780ddf1141f3b'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | * commit 'db3f61a04f1f66746660f921bb2780ddf1141f3b': x86: dsputil_init: Drop some unnecessary parentheses Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: dsputil_init: Drop some unnecessary parenthesesDiego Biurrun2014-03-13
| |
* | Merge commit '441b093915717afa7d24be34bdab2a4911b30a57'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | * commit '441b093915717afa7d24be34bdab2a4911b30a57': x86: dsputil_init: K&R formatting cosmetics Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: dsputil_init: K&R formatting cosmeticsDiego Biurrun2014-03-13
| |
* | Merge commit '4cb4680c1087a2cd13d4b0c9167a2eb3147f99d8'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | * commit '4cb4680c1087a2cd13d4b0c9167a2eb3147f99d8': x86: dsputil_x86.h: K&R formatting cosmetics Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: dsputil_x86.h: K&R formatting cosmeticsDiego Biurrun2014-03-13
| |
* | Merge commit 'f8bbebecfd7ea3dceb7c96f931beca33f80a3490'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | | | | | | | * commit 'f8bbebecfd7ea3dceb7c96f931beca33f80a3490': x86: motion_est: K&R formatting cosmetics Conflicts: libavcodec/x86/motion_est.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: motion_est: K&R formatting cosmeticsDiego Biurrun2014-03-13
| |
* | Merge commit 'a36947c167d7278b891453083b57dc56b7a7f5c5'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | | | | | | | * commit 'a36947c167d7278b891453083b57dc56b7a7f5c5': dsputilenc_mmx: K&R formatting cosmetics Conflicts: libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputilenc_mmx: K&R formatting cosmeticsDiego Biurrun2014-03-13
| |
* | Merge commit '38675229a879aa5258a8c71891fc8cbf74cf139f'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | | | | | | | * commit '38675229a879aa5258a8c71891fc8cbf74cf139f': dsputil_mmx: K&R formatting cosmetics Conflicts: libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil_mmx: K&R formatting cosmeticsDiego Biurrun2014-03-13
| |
* | Merge commit '6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | * commit '6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23': dsputilenc_mmx: Merge two assignment blocks with identical conditions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputilenc_mmx: Merge two assignment blocks with identical conditionsDiego Biurrun2014-03-13
| |
* | Merge commit '945673f792eb4141860ed66664156df685f7b7f0'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | | | | | | | * commit '945673f792eb4141860ed66664156df685f7b7f0': dsputil_template: K&R formatting cosmetics Conflicts: libavcodec/dsputil_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil_template: K&R formatting cosmeticsDiego Biurrun2014-03-13
| |
* | Merge commit 'acd2b8e42df25d46440583f93c12e5f285aebb31'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | * commit 'acd2b8e42df25d46440583f93c12e5f285aebb31': rnd_avg.h: K&R formatting cosmetics Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rnd_avg.h: K&R formatting cosmeticsDiego Biurrun2014-03-13
| |
* | Merge commit '05563ccacc98fd185affdbf8cbaf094caf36b852'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | | | | | | | | | * commit '05563ccacc98fd185affdbf8cbaf094caf36b852': dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names Conflicts: libavcodec/bit_depth_template.c libavcodec/motionpixels_tablegen.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl namesDiego Biurrun2014-03-13
| | | | | | | | Also switch from "tbl" to "tab" name suffixes.
* | Merge commit '635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | | | | | | | * commit '635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150': dsputil: Merge variable declarations and initializations Conflicts: libavcodec/dsputil_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Merge variable declarations and initializationsDiego Biurrun2014-03-13
| |
* | Merge commit 'bb12c2e9c00e3d3c393885849b8fa31cd849dc92'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | | | | | | | * commit 'bb12c2e9c00e3d3c393885849b8fa31cd849dc92': dsputil: K&R formatting cosmetics Conflicts: libavcodec/dsputil.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: K&R formatting cosmeticsDiego Biurrun2014-03-13
| |
* | Merge commit '503dda7d4f5b4d76eed0239e9da66993a182b009'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | | | | | | | * commit '503dda7d4f5b4d76eed0239e9da66993a182b009': dsputil.h: K&R formatting cosmetics Conflicts: libavcodec/dsputil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil.h: K&R formatting cosmeticsDiego Biurrun2014-03-13
| |
* | Merge commit '8199bb7be0db423bcbbd252d092386634fcf1d68'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | | | | | | | * commit '8199bb7be0db423bcbbd252d092386634fcf1d68': dsputil.h: Clean up comments Conflicts: libavcodec/dsputil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil.h: Clean up commentsDiego Biurrun2014-03-13
| |
* | Merge commit '0a8f91b1fbc1b627d8db8c734c812beb32102936'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | * commit '0a8f91b1fbc1b627d8db8c734c812beb32102936': dsputil: Remove disabled avg_no_rnd_qpel leftovers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Remove disabled avg_no_rnd_qpel leftoversDiego Biurrun2014-03-13
| |
* | Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | | | | | | | * commit '55519926ef855c671d084ccc151056de9e3d3a77': x86: Make function prototype comments in assembly code consistent Conflicts: libavcodec/x86/sbrdsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: Make function prototype comments in assembly code consistentDiego Biurrun2014-03-13
| | | | | | | | This helps grepping for functions, among other things.
* | Merge commit 'edd1f833fa145eb9c5026877c699ebe6efca00a0'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | * commit 'edd1f833fa145eb9c5026877c699ebe6efca00a0': x86: h264_idct_10_bit: Use proper type in function prototype comments Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: h264_idct_10_bit: Use proper type in function prototype commentsDiego Biurrun2014-03-13
| |
* | Merge commit '831a1180785a786272cdcefb71566a770bfb879e'Michael Niedermayer2014-03-13
|\| | | | | | | | | | | | | | | | | | | | | * commit '831a1180785a786272cdcefb71566a770bfb879e': Update dsputil- and SIMD-related comments to match reality more closely Conflicts: libavcodec/x86/hpeldsp.asm libavutil/arm/float_dsp_init_arm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Update dsputil- and SIMD-related comments to match reality more closelyDiego Biurrun2014-03-13
| |
* | Merge commit 'd1184b8110b4847013bf25222e6809eb3462913c'Michael Niedermayer2014-03-13
|\| | | | | | | | | | | | | * commit 'd1184b8110b4847013bf25222e6809eb3462913c': arm: dsputil: Add a bunch of missing #includes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: dsputil: Add a bunch of missing #includesDiego Biurrun2014-03-13
| |