wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
76449 commits 40 branches 405 tags 230 MiB
Commit graph

34081 commits

Author SHA1 Message Date
Michael Niedermayer
b7a5f5dc66 Merge commit 'a36947c167' 
* commit 'a36947c167':
  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 '38675229a8' 
* commit '38675229a8':
  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 '6a8b35dc88' 
* commit '6a8b35dc88':
  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 '945673f792' 
* commit '945673f792':
  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 'acd2b8e42d' 
* commit 'acd2b8e42d':
  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 '05563ccacc' 
* commit '05563ccacc':
  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 '635ec127d4' 
* commit '635ec127d4':
  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 'bb12c2e9c0' 
* commit 'bb12c2e9c0':
  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 '503dda7d4f' 
* commit '503dda7d4f':
  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 '8199bb7be0' 
* commit '8199bb7be0':
  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 '0a8f91b1fb' 
* commit '0a8f91b1fb':
  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 '55519926ef' 
* commit '55519926ef':
  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 'edd1f833fa' 
* commit 'edd1f833fa':
  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 '831a118078' 
* commit '831a118078':
  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 'd1184b8110' 
* commit 'd1184b8110':
  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 '17608f6ee3' 
* commit '17608f6ee3':
  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 'fd9e2221bd' 
* commit 'fd9e2221bd':
  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 'ed9625eb62' 
* commit 'ed9625eb62':
  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
1306359ea9 Merge commit '49676eb730' 
* commit '49676eb730':
  dsputil: Remove prototypes for nonexisting optimization functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 22:56:08 +01:00
Vittorio Giovara
2e708f1708 ljpeg: fix duplicated pixel format entry 2014-03-13 22:55:37 +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 'b4dd424d96' 
* commit 'b4dd424d96':
  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 'd6096a6742' 
* commit 'd6096a6742':
  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
daded4f89a Merge commit 'cd832f032f' 
* commit 'cd832f032f':
  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
4b50de88a4 Merge commit '88b240646f' 
* commit '88b240646f':
  build: Drop stray mpc8 decoder dependency on dsputil

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 21:06:42 +01:00
Diego Biurrun
eb2b8bce39 bfin: Use more sensible file names 
Drop non-informative _bfin suffix, rename some files for consistency with
other architectures, rename others to reflect their content.
 2014-03-13 08:15:53 -07:00
Diego Biurrun
929ec39ec4 bfin: hpeldsp: Split no_rnd pixel operations off into a separate file 
This saves some space in configurations that do not enable hpeldsp.
 2014-03-13 08:15:53 -07:00
Diego Biurrun
a7cc4ac9d9 bfin: dsputil: Unconditionally compile hpel pixels code 
The functions it contains are used from unconditionally compiled code.
 2014-03-13 08:15:53 -07:00
Diego Biurrun
13ae97b210 bfin: hpeldsp: "nornd" ---> "no_rnd" function name suffix for consistency 2014-03-13 08:15:53 -07:00
Diego Biurrun
bbf0ef57e9 bfin: Move all assembly declarations only used within one .c file there 
This is done similarly for all other architectures.
 2014-03-13 08:15:53 -07:00
Diego Biurrun
80173c71ba bfin: hpeldsp: K&R formatting cosmetics 2014-03-13 08:15:52 -07:00
Diego Biurrun
da785231ea bfin: Refactor duplicated assembly-related macros 2014-03-13 08:15:52 -07:00
Diego Biurrun
e99af2a3b1 bfin: Refactor duplicated l1_text/l1_data_B macros 2014-03-13 08:15:52 -07:00
Diego Biurrun
a3e7562621 bfin: dsputil: K&R formatting cosmetics 
Also add a few #endif comments.
 2014-03-13 08:15:52 -07: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
Diego Biurrun
f8bbebecfd x86: motion_est: K&R formatting cosmetics 2014-03-13 08:15:51 -07:00
Diego Biurrun
a36947c167 dsputilenc_mmx: K&R formatting cosmetics 2014-03-13 08:15:51 -07:00
Diego Biurrun
38675229a8 dsputil_mmx: K&R formatting cosmetics 2014-03-13 08:15:51 -07:00
Diego Biurrun
6a8b35dc88 dsputilenc_mmx: Merge two assignment blocks with identical conditions 2014-03-13 08:15:51 -07:00
Diego Biurrun
945673f792 dsputil_template: K&R formatting cosmetics 2014-03-13 08:15:50 -07:00
Diego Biurrun
acd2b8e42d rnd_avg.h: K&R formatting cosmetics 2014-03-13 08:15:50 -07:00
Diego Biurrun
05563ccacc dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names 
Also switch from "tbl" to "tab" name suffixes.
 2014-03-13 08:12:44 -07:00
Diego Biurrun
635ec127d4 dsputil: Merge variable declarations and initializations 2014-03-13 08:12:44 -07:00