generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
61,427 Commits 24 Branches 241 Tags 173 MiB
a4369dbb8f
Commit Graph

61427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
a4369dbb8f Merge commit '1e33095b83addd8d24bc16bd08aa734fa161d515' 
* commit '1e33095b83addd8d24bc16bd08aa734fa161d515':
  bfin: dsputil: Drop broken and trivial profiling code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 01:48:39 +01:00
Michael Niedermayer
2b02c1a698 Merge commit 'f5f099766816aab3ad805c63e85f12cb664dc9a8' 
* commit 'f5f099766816aab3ad805c63e85f12cb664dc9a8':
  bfin: hpeldsp: Drop broken put_pixels_*_xy2_nornd bits

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 01:43:08 +01:00
Michael Niedermayer
c686cf23aa Merge commit '14efbe694ac5beff98f5c5e652c166603f1738cf' 
* commit '14efbe694ac5beff98f5c5e652c166603f1738cf':
  bfin: dsputil: Drop broken vsad bits

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 01:42:47 +01:00
Michael Niedermayer
0f95856834 Merge commit '671c8785596ea4a45817ba302289004ff456630a' 
* commit '671c8785596ea4a45817ba302289004ff456630a':
  bfin: dsputil: Remove unused global variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 01:42:20 +01:00
Michael Niedermayer
5dd97d5809 Merge commit 'db3f61a04f1f66746660f921bb2780ddf1141f3b' 
* commit 'db3f61a04f1f66746660f921bb2780ddf1141f3b':
  x86: dsputil_init: Drop some unnecessary parentheses

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 01:25:57 +01:00
Michael Niedermayer
27cab16ce7 Merge commit '441b093915717afa7d24be34bdab2a4911b30a57' 
* commit '441b093915717afa7d24be34bdab2a4911b30a57':
  x86: dsputil_init: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 01:25:36 +01:00
Michael Niedermayer
236874a571 Merge commit '4cb4680c1087a2cd13d4b0c9167a2eb3147f99d8' 
* commit '4cb4680c1087a2cd13d4b0c9167a2eb3147f99d8':
  x86: dsputil_x86.h: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 01:25:19 +01:00
Michael Niedermayer
925ce6faf4 Merge commit 'f8bbebecfd7ea3dceb7c96f931beca33f80a3490' 
* commit 'f8bbebecfd7ea3dceb7c96f931beca33f80a3490':
  x86: motion_est: K&R formatting cosmetics

Conflicts:
	libavcodec/x86/motion_est.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 01:20:43 +01:00
Michael Niedermayer
b7a5f5dc66 Merge commit 'a36947c167d7278b891453083b57dc56b7a7f5c5' 
* commit 'a36947c167d7278b891453083b57dc56b7a7f5c5':
  dsputilenc_mmx: K&R formatting cosmetics

Conflicts:
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 01:09:57 +01:00
Michael Niedermayer
d926c4b240 Merge commit '38675229a879aa5258a8c71891fc8cbf74cf139f' 
* commit '38675229a879aa5258a8c71891fc8cbf74cf139f':
  dsputil_mmx: K&R formatting cosmetics

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 01:01:37 +01:00
Michael Niedermayer
55f53f6c29 Merge commit '6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23' 
* commit '6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23':
  dsputilenc_mmx: Merge two assignment blocks with identical conditions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 00:57:25 +01:00
Michael Niedermayer
fdf4eb7911 Merge commit '945673f792eb4141860ed66664156df685f7b7f0' 
* commit '945673f792eb4141860ed66664156df685f7b7f0':
  dsputil_template: K&R formatting cosmetics

Conflicts:
	libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 00:52:07 +01:00
Michael Niedermayer
3a27f968f9 Merge commit 'acd2b8e42df25d46440583f93c12e5f285aebb31' 
* commit 'acd2b8e42df25d46440583f93c12e5f285aebb31':
  rnd_avg.h: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 00:45:26 +01:00
Michael Niedermayer
6016b8329b Merge commit '05563ccacc98fd185affdbf8cbaf094caf36b852' 
* 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>
 2014-03-14 00:39:51 +01:00
Michael Niedermayer
16f619f57c Merge commit '635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150' 
* commit '635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150':
  dsputil: Merge variable declarations and initializations

Conflicts:
	libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 00:37:28 +01:00
Michael Niedermayer
dd7c2e9bce Merge commit 'bb12c2e9c00e3d3c393885849b8fa31cd849dc92' 
* commit 'bb12c2e9c00e3d3c393885849b8fa31cd849dc92':
  dsputil: K&R formatting cosmetics

Conflicts:
	libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 00:31:48 +01:00
Michael Niedermayer
db94b144e9 Merge commit '503dda7d4f5b4d76eed0239e9da66993a182b009' 
* commit '503dda7d4f5b4d76eed0239e9da66993a182b009':
  dsputil.h: K&R formatting cosmetics

Conflicts:
	libavcodec/dsputil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 00:18:38 +01:00
Michael Niedermayer
153557dfcb Merge commit '8199bb7be0db423bcbbd252d092386634fcf1d68' 
* commit '8199bb7be0db423bcbbd252d092386634fcf1d68':
  dsputil.h: Clean up comments

Conflicts:
	libavcodec/dsputil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 00:10:31 +01:00
Michael Niedermayer
ea2bd139b7 Merge commit '0a8f91b1fbc1b627d8db8c734c812beb32102936' 
* commit '0a8f91b1fbc1b627d8db8c734c812beb32102936':
  dsputil: Remove disabled avg_no_rnd_qpel leftovers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 00:07:47 +01:00
Michael Niedermayer
4104eb44e6 Merge commit '55519926ef855c671d084ccc151056de9e3d3a77' 
* commit '55519926ef855c671d084ccc151056de9e3d3a77':
  x86: Make function prototype comments in assembly code consistent

Conflicts:
	libavcodec/x86/sbrdsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 00:01:30 +01:00
Michael Niedermayer
a9b1936a4e Merge commit 'edd1f833fa145eb9c5026877c699ebe6efca00a0' 
* commit 'edd1f833fa145eb9c5026877c699ebe6efca00a0':
  x86: h264_idct_10_bit: Use proper type in function prototype comments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 00:00:16 +01:00
Michael Niedermayer
1c788eaca9 Merge commit '831a1180785a786272cdcefb71566a770bfb879e' 
* 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>
 2014-03-13 23:59:56 +01:00
Michael Niedermayer
be879af217 Merge commit 'd1184b8110b4847013bf25222e6809eb3462913c' 
* commit 'd1184b8110b4847013bf25222e6809eb3462913c':
  arm: dsputil: Add a bunch of missing #includes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 23:41:40 +01:00
Michael Niedermayer
d61e1156be Merge commit '17608f6ee3d2088cdb8d1e704276d8b34f01160d' 
* commit '17608f6ee3d2088cdb8d1e704276d8b34f01160d':
  x86: Add some more missing headers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 23:41:17 +01:00
Michael Niedermayer
e52d97a7ac Merge commit 'fd9e2221bd3b2c5d62605134b62efa26eb9ef0f7' 
* commit 'fd9e2221bd3b2c5d62605134b62efa26eb9ef0f7':
  ppc: Add some missing headers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 23:40:55 +01:00
Michael Niedermayer
5dce8e56c6 Merge commit 'ed9625eb62be1e1c44cecdd73ea0d80077a15d48' 
* commit 'ed9625eb62be1e1c44cecdd73ea0d80077a15d48':
  dsputil: Move intreadwrite.h #include from header file to .c files

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 23:30:43 +01:00
Michael Niedermayer
f5e6b49cd2 Merge commit '9103185bd116930f90b847090e66a64fa9971ce2' 
* commit '9103185bd116930f90b847090e66a64fa9971ce2':
  dsputil: Drop ff_check_alignment() function

Conflicts:
	libavcodec/dsputil.c

Not merged, as this check can safe the user and us some time
debuging misalignment issues.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 23:24:50 +01:00
Michael Niedermayer
1306359ea9 Merge commit '49676eb7301e775d08bdbba5380159b106ee258f' 
* commit '49676eb7301e775d08bdbba5380159b106ee258f':
  dsputil: Remove prototypes for nonexisting optimization functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 22:56:08 +01:00
Michael Niedermayer
8ccf21839a Merge commit '08dba0e1c3df3b71270ebce4527bffa155b91b97' 
* commit '08dba0e1c3df3b71270ebce4527bffa155b91b97':
  x86: mpegvideoenc: Remove some remnants of the long-gone libmpeg2 IDCT

Not merged as the removed code is still used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 22:52:52 +01:00
Michael Niedermayer
b7cffc81b7 avcodec/sparc: add note about the removial 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 22:37:38 +01:00
Michael Niedermayer
3fc2362aef Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143' 
* commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143':
  Remove all SPARC architecture optimizations

Conflicts:
	Makefile
	configure
	libavcodec/sparc/dsputil_vis.c
	libavcodec/sparc/dsputil_vis.h
	libavcodec/sparc/hpeldsp_vis.c
	libavcodec/sparc/simple_idct_vis.c
	libavcodec/sparc/vis.h
	libswscale/sparc/yuv2rgb_vis.c
	libswscale/swscale_internal.h

If someone wants to maintain these (or other) SPARC optimizations, please
contact me or ffmpeg-devel.
I am happy to revert this removial if theres someone considering to
maintain this code.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 22:35:47 +01:00
Michael Niedermayer
fb1b70c1ed libavcodec/sh4: add note about the removial 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 22:24:19 +01:00
Michael Niedermayer
7ac1e27f0f Merge commit 'd6096a67422534918405abb46dafbbac4608cbc3' 
* commit 'd6096a67422534918405abb46dafbbac4608cbc3':
  Remove all SH4 architecture optimizations

Conflicts:
	libavcodec/sh4/dsputil_sh4.c
	libavcodec/sh4/dsputil_sh4.h
	libavcodec/sh4/idct_sh4.c
	libavcodec/sh4/sh4.h

If someone wants to maintain these (or other) SH4 optimizations, please
contact me or ffmpeg-devel.
I am happy to revert this removial if theres someone considering to
maintain this code.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 22:06:01 +01:00
Michael Niedermayer
cbfc9046e1 Merge commit 'bbb64356cca65d7a2a33f59b2267ee58f28a061a' 
* commit 'bbb64356cca65d7a2a33f59b2267ee58f28a061a':
  build: Record dependency of eatqi decoder on dsputil

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 21:40:41 +01:00
Michael Niedermayer
96b02460fc Merge commit 'b5f112d820934ade66e809ef30bfcfc8210929f8' 
* commit 'b5f112d820934ade66e809ef30bfcfc8210929f8':
  configure: Add explicit dsputil dependency to mpegvideoenc

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 21:35:56 +01:00
Michael Niedermayer
daded4f89a Merge commit 'cd832f032f945a57a1f1dd385942c2fadc7ce4e5' 
* commit 'cd832f032f945a57a1f1dd385942c2fadc7ce4e5':
  ffv1: Drop bogus dependency on dsputil

Conflicts:
	configure
	libavcodec/ffv1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 21:26:49 +01:00
Michael Niedermayer
981aa02338 Merge commit '0e29c5e1285eeb5b4842d96d00dfe06898cd87e5' 
* commit '0e29c5e1285eeb5b4842d96d00dfe06898cd87e5':
  build: Drop stray LPC dependency on dsputil

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 21:23:42 +01:00
Michael Niedermayer
2631d155ba Merge commit '6cd76e5412d794dbd1cc6ab0e4c9f2ee53cf028f' 
* commit '6cd76e5412d794dbd1cc6ab0e4c9f2ee53cf028f':
  build: Drop stray MJPEG encoder dependency on dsputil

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 21:17:46 +01:00
Michael Niedermayer
07dbdcf9d0 Merge commit '9ecf1b62f37ef9cbdf2d7300a052cd704c4ba731' 
* commit '9ecf1b62f37ef9cbdf2d7300a052cd704c4ba731':
  build: Drop stray MLP decoder dependency on dsputil

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 21:16:13 +01:00
Michael Niedermayer
ecf16f039d Merge commit '7d7be44f3e8bc14224540a477ef0607f18964421' 
* commit '7d7be44f3e8bc14224540a477ef0607f18964421':
  build: Drop stray PNG decoder dependency on dsputil

Conflicts:
	configure

No change as the stray dependency was not in our configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 21:10:43 +01:00
Michael Niedermayer
4b50de88a4 Merge commit '88b240646f57a62299c6c4c4d7554f0a80c3a29a' 
* commit '88b240646f57a62299c6c4c4d7554f0a80c3a29a':
  build: Drop stray mpc8 decoder dependency on dsputil

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 21:06:42 +01:00
Michael Niedermayer
a47dfdfa7d Merge commit 'fb9a5bdc516b75b4ba1e36ca2223dec46571dea3' 
* commit 'fb9a5bdc516b75b4ba1e36ca2223dec46571dea3':
  Prepare for 11_alpha1 Release

Conflicts:
	RELEASE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 21:01:14 +01:00
Michael Niedermayer
8b02dfd37c avutil/timestamp: Warn about missing __STDC_FORMAT_MACROS for C++ use 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 17:32:15 +01:00
Diego Biurrun
1e33095b83 bfin: dsputil: Drop broken and trivial profiling code 2014-03-13 08:15:52 -07:00
Diego Biurrun
f5f0997668 bfin: hpeldsp: Drop broken put_pixels_*_xy2_nornd bits 
They were marked as broken and disabled in 2009 and will never get fixed.
 2014-03-13 08:15:52 -07:00
Diego Biurrun
14efbe694a bfin: dsputil: Drop broken vsad bits 
They were marked as broken and disabled in 2009 and will never get fixed.
 2014-03-13 08:15:52 -07:00
Diego Biurrun
671c878559 bfin: dsputil: Remove unused global variable 2014-03-13 08:15:51 -07:00
Diego Biurrun
db3f61a04f x86: dsputil_init: Drop some unnecessary parentheses 2014-03-13 08:15:51 -07:00
Diego Biurrun
441b093915 x86: dsputil_init: K&R formatting cosmetics 2014-03-13 08:15:51 -07:00
Diego Biurrun
4cb4680c10 x86: dsputil_x86.h: K&R formatting cosmetics 2014-03-13 08:15:51 -07:00