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

61383 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Niedermayer
f385a099c1 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Fix hardware detection on aix.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 15:00:53 +01:00
Michael Niedermayer
bb6de15d92 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: Match stream id

Conflicts:
	cmdutils.c
	doc/fftools-common-opts.texi

See: ea07063fd8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 14:21:27 +01:00
Diego Biurrun
d1184b8110 arm: dsputil: Add a bunch of missing #includes 2014-03-13 05:50:28 -07:00
Diego Biurrun
17608f6ee3 x86: Add some more missing headers 2014-03-13 05:50:28 -07:00
Diego Biurrun
fd9e2221bd ppc: Add some missing headers 2014-03-13 05:50:28 -07:00
Diego Biurrun
ed9625eb62 dsputil: Move intreadwrite.h #include from header file to .c files 2014-03-13 05:50:28 -07:00
Diego Biurrun
9103185bd1 dsputil: Drop ff_check_alignment() function 
The function is supposed to confirm that the compiler provided enough
alignment, but in practice it is only run in certain code paths and
insufficient alignment problems are restricted to legacy compilers.
 2014-03-13 05:50:28 -07:00
Diego Biurrun
49676eb730 dsputil: Remove prototypes for nonexisting optimization functions 2014-03-13 05:50:28 -07:00
Diego Biurrun
08dba0e1c3 x86: mpegvideoenc: Remove some remnants of the long-gone libmpeg2 IDCT 2014-03-13 05:50:28 -07:00
Diego Biurrun
b4dd424d96 Remove all SPARC architecture optimizations 
SPARC is no longer being used in any multimedia-related fields and the
VIS optimizations only represent a maintenance burden.
 2014-03-13 05:50:28 -07:00
Diego Biurrun
d6096a6742 Remove all SH4 architecture optimizations 
SH4 has been end-of-lifed and no more test machines are available.
 2014-03-13 05:50:28 -07:00
Diego Biurrun
bbb64356cc build: Record dependency of eatqi decoder on dsputil 2014-03-13 05:50:27 -07:00
Diego Biurrun
b5f112d820 configure: Add explicit dsputil dependency to mpegvideoenc 
Previously, it was an implicit dependency through mpegvideo. Change
this, as implicit dependencies can cause all sorts of trouble.
 2014-03-13 05:50:27 -07:00
Diego Biurrun
cd832f032f ffv1: Drop bogus dependency on dsputil 
ffv1 does not use any part of the dsputil framework.
 2014-03-13 05:50:27 -07:00
Diego Biurrun
0e29c5e128 build: Drop stray LPC dependency on dsputil 2014-03-13 05:50:27 -07:00
Diego Biurrun
6cd76e5412 build: Drop stray MJPEG encoder dependency on dsputil 2014-03-13 05:50:27 -07:00
Diego Biurrun
9ecf1b62f3 build: Drop stray MLP decoder dependency on dsputil 2014-03-13 05:50:27 -07:00
Diego Biurrun
7d7be44f3e build: Drop stray PNG decoder dependency on dsputil 2014-03-13 05:50:27 -07:00
Diego Biurrun
88b240646f build: Drop stray mpc8 decoder dependency on dsputil 2014-03-13 05:50:27 -07:00
Reinhard Tartler
fb9a5bdc51 Prepare for 11_alpha1 Release 2014-03-13 08:24:11 -04:00
Luca Barbato
81498ceb5b avconv: Match stream id 
Quite useful to select by pid in MPEG-TS.
 2014-03-13 11:59:34 +01:00
Carl Eugen Hoyos
aac9e56759 Fix hardware detection on aix. 2014-03-13 08:34:45 +01:00
James Almer
7d7487e85c x86/float_dsp: add ff_vector_{fmul_add, fmac_scalar}_fma3 
~7% faster than AVX

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 04:34:05 +01:00
Michael Niedermayer
12ce58bebd doc/texi2pod: fix encoding type 
docs say:
'A document having more than one "=encoding" line should be considered an error. '

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 03:54:48 +01:00
Michael Niedermayer
72d44f1583 mvformat/movenc: fix IMX 
fixes Ticket3351

Tested-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 01:28:43 +01:00
Michael Niedermayer
11ed7ec092 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  http: Properly initialize icy headers string

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 23:24:19 +01:00
Michael Niedermayer
b5c6b23acd doc/platform: mention that yuvis gas-preprocessor is currently missing some changes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 23:08:41 +01:00
Michael Niedermayer
98eb99d20b tools/build_libstagefright: switch git urls to https 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 23:07:00 +01:00
Michael Niedermayer
675a66a93b doc: switch github urls to https 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 23:05:26 +01:00