]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Fri, 14 Mar 2014 17:24:56 +0000 (18:24 +0100)]
Merge commit '
36b822b8be7f9ecd6f9d87acaa786b128a873cd9 '
* commit '
36b822b8be7f9ecd6f9d87acaa786b128a873cd9 ':
arm: dsputil: Drop restrict keyword from add_pixels_clamped_armv6 prototype
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Fri, 14 Mar 2014 02:45:07 +0000 (23:45 -0300)]
configure: add missing avx2 support check
AVX2 support was introduced in Yasm 1.2.0, and some distros
like Debian still feature version 1.1.0
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Fri, 14 Mar 2014 09:02:04 +0000 (20:02 +1100)]
avcodec/adpcm: squelch 'mismatch in coded sample count' warning for AV_CODEC_ID_ADPCM_EA_R2/3
These ADPCM codecs include a per-frame flag that enables a raw 16-bit mode. Therefore
the the number of samples returned by get_nb_samples() is only ever approximate.
Fixes ticket #3460.
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 13:28:28 +0000 (14:28 +0100)]
avcodec/arm/fft_fixed_neon: reduce diff by 2 spaces to libav
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 14 Mar 2014 12:22:50 +0000 (13:22 +0100)]
arm: dsputil: Drop restrict keyword from add_pixels_clamped_armv6 prototype
The function is assigned to a function pointer that does not have the
restrict keyword for that parameter.
This fixes compilation for MSVC builds that don't recognize "restrict",
broken since
ed9625eb62 .
Michael Niedermayer [Fri, 14 Mar 2014 11:00:45 +0000 (12:00 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aac: K&R formatting cosmetics
Conflicts:
libavformat/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 10:52:28 +0000 (11:52 +0100)]
Merge commit '
2e708f17083fc41f10161f2406d57ec154c75468 '
* commit '
2e708f17083fc41f10161f2406d57ec154c75468 ':
ljpeg: fix duplicated pixel format entry
Conflicts:
libavcodec/ljpegenc.c
No change as there was no duplicate entry in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 03:26:24 +0000 (04:26 +0100)]
avcodec/libx265: fill headers in extradata
Fixes Ticket3457
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 01:12:45 +0000 (02:12 +0100)]
Merge commit '
eb2b8bce39c93d16a02656238248c6cf697f447f '
* commit '
eb2b8bce39c93d16a02656238248c6cf697f447f ':
bfin: Use more sensible file names
Conflicts:
libavcodec/bfin/pixels.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 01:05:27 +0000 (02:05 +0100)]
Merge commit '
929ec39ec4497827f7530f2aaa31646ef35462ee '
* commit '
929ec39ec4497827f7530f2aaa31646ef35462ee ':
bfin: hpeldsp: Split no_rnd pixel operations off into a separate file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 01:04:54 +0000 (02:04 +0100)]
Merge commit '
a7cc4ac9d99bd586c8939f4312f8c9e56d5f5730 '
* commit '
a7cc4ac9d99bd586c8939f4312f8c9e56d5f5730 ':
bfin: dsputil: Unconditionally compile hpel pixels code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 01:04:04 +0000 (02:04 +0100)]
Merge commit '
13ae97b210f35d77290f4edb0d6846269271729a '
* commit '
13ae97b210f35d77290f4edb0d6846269271729a ':
bfin: hpeldsp: "nornd" ---> "no_rnd" function name suffix for consistency
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 00:57:41 +0000 (01:57 +0100)]
Merge commit '
bbf0ef57e9d2d7bb2995f664dd74c8229bca25f5 '
* commit '
bbf0ef57e9d2d7bb2995f664dd74c8229bca25f5 ':
bfin: Move all assembly declarations only used within one .c file there
Conflicts:
libavcodec/bfin/dsputil_bfin.h
libavcodec/bfin/vp3_bfin.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 00:56:40 +0000 (01:56 +0100)]
Merge commit '
80173c71bab3b8817c148837bdc920557018f428 '
* commit '
80173c71bab3b8817c148837bdc920557018f428 ':
bfin: hpeldsp: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 00:56:25 +0000 (01:56 +0100)]
Merge commit '
da785231ea0b82b5c2526babbb2871c935b21a87 '
* commit '
da785231ea0b82b5c2526babbb2871c935b21a87 ':
bfin: Refactor duplicated assembly-related macros
Conflicts:
libavcodec/bfin/hpel_pixels_bfin.S
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 00:49:10 +0000 (01:49 +0100)]
Merge commit '
e99af2a3b1660b4f328335149980064692097cad '
* commit '
e99af2a3b1660b4f328335149980064692097cad ':
bfin: Refactor duplicated l1_text/l1_data_B macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 00:48:51 +0000 (01:48 +0100)]
Merge commit '
a3e7562621bd96ce909e07149c419b6ba85cc54f '
* commit '
a3e7562621bd96ce909e07149c419b6ba85cc54f ':
bfin: dsputil: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 00:48:36 +0000 (01:48 +0100)]
Merge commit '
1e33095b83addd8d24bc16bd08aa734fa161d515 '
* commit '
1e33095b83addd8d24bc16bd08aa734fa161d515 ':
bfin: dsputil: Drop broken and trivial profiling code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 00:43:03 +0000 (01:43 +0100)]
Merge commit '
f5f099766816aab3ad805c63e85f12cb664dc9a8 '
* commit '
f5f099766816aab3ad805c63e85f12cb664dc9a8 ':
bfin: hpeldsp: Drop broken put_pixels_*_xy2_nornd bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 00:42:42 +0000 (01:42 +0100)]
Merge commit '
14efbe694ac5beff98f5c5e652c166603f1738cf '
* commit '
14efbe694ac5beff98f5c5e652c166603f1738cf ':
bfin: dsputil: Drop broken vsad bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 00:42:14 +0000 (01:42 +0100)]
Merge commit '
671c8785596ea4a45817ba302289004ff456630a '
* commit '
671c8785596ea4a45817ba302289004ff456630a ':
bfin: dsputil: Remove unused global variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 00:25:53 +0000 (01:25 +0100)]
Merge commit '
db3f61a04f1f66746660f921bb2780ddf1141f3b '
* commit '
db3f61a04f1f66746660f921bb2780ddf1141f3b ':
x86: dsputil_init: Drop some unnecessary parentheses
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 00:25:32 +0000 (01:25 +0100)]
Merge commit '
441b093915717afa7d24be34bdab2a4911b30a57 '
* commit '
441b093915717afa7d24be34bdab2a4911b30a57 ':
x86: dsputil_init: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 00:25:06 +0000 (01:25 +0100)]
Merge commit '
4cb4680c1087a2cd13d4b0c9167a2eb3147f99d8 '
* commit '
4cb4680c1087a2cd13d4b0c9167a2eb3147f99d8 ':
x86: dsputil_x86.h: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Tue, 11 Mar 2014 12:29:33 +0000 (12:29 +0000)]
aac: K&R formatting cosmetics
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Michael Niedermayer [Fri, 14 Mar 2014 00:20:43 +0000 (01:20 +0100)]
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>
Michael Niedermayer [Fri, 14 Mar 2014 00:09:57 +0000 (01:09 +0100)]
Merge commit '
a36947c167d7278b891453083b57dc56b7a7f5c5 '
* commit '
a36947c167d7278b891453083b57dc56b7a7f5c5 ':
dsputilenc_mmx: K&R formatting cosmetics
Conflicts:
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 00:01:37 +0000 (01:01 +0100)]
Merge commit '
38675229a879aa5258a8c71891fc8cbf74cf139f '
* commit '
38675229a879aa5258a8c71891fc8cbf74cf139f ':
dsputil_mmx: K&R formatting cosmetics
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 23:57:21 +0000 (00:57 +0100)]
Merge commit '
6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23 '
* commit '
6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23 ':
dsputilenc_mmx: Merge two assignment blocks with identical conditions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 23:52:07 +0000 (00:52 +0100)]
Merge commit '
945673f792eb4141860ed66664156df685f7b7f0 '
* commit '
945673f792eb4141860ed66664156df685f7b7f0 ':
dsputil_template: K&R formatting cosmetics
Conflicts:
libavcodec/dsputil_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 23:45:22 +0000 (00:45 +0100)]
Merge commit '
acd2b8e42df25d46440583f93c12e5f285aebb31 '
* commit '
acd2b8e42df25d46440583f93c12e5f285aebb31 ':
rnd_avg.h: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 23:38:47 +0000 (00:38 +0100)]
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>
Michael Niedermayer [Thu, 13 Mar 2014 23:37:28 +0000 (00:37 +0100)]
Merge commit '
635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150 '
* commit '
635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150 ':
dsputil: Merge variable declarations and initializations
Conflicts:
libavcodec/dsputil_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 23:31:48 +0000 (00:31 +0100)]
Merge commit '
bb12c2e9c00e3d3c393885849b8fa31cd849dc92 '
* commit '
bb12c2e9c00e3d3c393885849b8fa31cd849dc92 ':
dsputil: K&R formatting cosmetics
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 23:18:38 +0000 (00:18 +0100)]
Merge commit '
503dda7d4f5b4d76eed0239e9da66993a182b009 '
* commit '
503dda7d4f5b4d76eed0239e9da66993a182b009 ':
dsputil.h: K&R formatting cosmetics
Conflicts:
libavcodec/dsputil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 23:10:31 +0000 (00:10 +0100)]
Merge commit '
8199bb7be0db423bcbbd252d092386634fcf1d68 '
* commit '
8199bb7be0db423bcbbd252d092386634fcf1d68 ':
dsputil.h: Clean up comments
Conflicts:
libavcodec/dsputil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 23:07:42 +0000 (00:07 +0100)]
Merge commit '
0a8f91b1fbc1b627d8db8c734c812beb32102936 '
* commit '
0a8f91b1fbc1b627d8db8c734c812beb32102936 ':
dsputil: Remove disabled avg_no_rnd_qpel leftovers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 23:01:30 +0000 (00:01 +0100)]
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>
Michael Niedermayer [Thu, 13 Mar 2014 23:00:12 +0000 (00:00 +0100)]
Merge commit '
edd1f833fa145eb9c5026877c699ebe6efca00a0 '
* commit '
edd1f833fa145eb9c5026877c699ebe6efca00a0 ':
x86: h264_idct_10_bit: Use proper type in function prototype comments
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 22:59:56 +0000 (23:59 +0100)]
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>
Michael Niedermayer [Thu, 13 Mar 2014 22:41:36 +0000 (23:41 +0100)]
Merge commit '
d1184b8110b4847013bf25222e6809eb3462913c '
* commit '
d1184b8110b4847013bf25222e6809eb3462913c ':
arm: dsputil: Add a bunch of missing #includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 22:41:12 +0000 (23:41 +0100)]
Merge commit '
17608f6ee3d2088cdb8d1e704276d8b34f01160d '
* commit '
17608f6ee3d2088cdb8d1e704276d8b34f01160d ':
x86: Add some more missing headers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 22:40:51 +0000 (23:40 +0100)]
Merge commit '
fd9e2221bd3b2c5d62605134b62efa26eb9ef0f7 '
* commit '
fd9e2221bd3b2c5d62605134b62efa26eb9ef0f7 ':
ppc: Add some missing headers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 22:25:21 +0000 (23:25 +0100)]
Merge commit '
ed9625eb62be1e1c44cecdd73ea0d80077a15d48 '
* commit '
ed9625eb62be1e1c44cecdd73ea0d80077a15d48 ':
dsputil: Move intreadwrite.h #include from header file to .c files
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 22:07:17 +0000 (23:07 +0100)]
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>
Michael Niedermayer [Thu, 13 Mar 2014 21:55:33 +0000 (22:55 +0100)]
Merge commit '
49676eb7301e775d08bdbba5380159b106ee258f '
* commit '
49676eb7301e775d08bdbba5380159b106ee258f ':
dsputil: Remove prototypes for nonexisting optimization functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Wed, 12 Mar 2014 14:19:12 +0000 (15:19 +0100)]
ljpeg: fix duplicated pixel format entry
Michael Niedermayer [Thu, 13 Mar 2014 21:38:04 +0000 (22:38 +0100)]
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>
Michael Niedermayer [Thu, 13 Mar 2014 21:37:38 +0000 (22:37 +0100)]
avcodec/sparc: add note about the removial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 21:27:17 +0000 (22:27 +0100)]
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>
Michael Niedermayer [Thu, 13 Mar 2014 21:17:52 +0000 (22:17 +0100)]
libavcodec/sh4: add note about the removial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 20:59:38 +0000 (21:59 +0100)]
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>
Michael Niedermayer [Thu, 13 Mar 2014 20:40:41 +0000 (21:40 +0100)]
Merge commit '
bbb64356cca65d7a2a33f59b2267ee58f28a061a '
* commit '
bbb64356cca65d7a2a33f59b2267ee58f28a061a ':
build: Record dependency of eatqi decoder on dsputil
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 20:35:56 +0000 (21:35 +0100)]
Merge commit '
b5f112d820934ade66e809ef30bfcfc8210929f8 '
* commit '
b5f112d820934ade66e809ef30bfcfc8210929f8 ':
configure: Add explicit dsputil dependency to mpegvideoenc
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 20:26:49 +0000 (21:26 +0100)]
Merge commit '
cd832f032f945a57a1f1dd385942c2fadc7ce4e5 '
* commit '
cd832f032f945a57a1f1dd385942c2fadc7ce4e5 ':
ffv1: Drop bogus dependency on dsputil
Conflicts:
configure
libavcodec/ffv1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 20:23:42 +0000 (21:23 +0100)]
Merge commit '
0e29c5e1285eeb5b4842d96d00dfe06898cd87e5 '
* commit '
0e29c5e1285eeb5b4842d96d00dfe06898cd87e5 ':
build: Drop stray LPC dependency on dsputil
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 20:17:46 +0000 (21:17 +0100)]
Merge commit '
6cd76e5412d794dbd1cc6ab0e4c9f2ee53cf028f '
* commit '
6cd76e5412d794dbd1cc6ab0e4c9f2ee53cf028f ':
build: Drop stray MJPEG encoder dependency on dsputil
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 20:16:02 +0000 (21:16 +0100)]
Merge commit '
9ecf1b62f37ef9cbdf2d7300a052cd704c4ba731 '
* commit '
9ecf1b62f37ef9cbdf2d7300a052cd704c4ba731 ':
build: Drop stray MLP decoder dependency on dsputil
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 20:10:30 +0000 (21:10 +0100)]
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>
Michael Niedermayer [Thu, 13 Mar 2014 20:06:30 +0000 (21:06 +0100)]
Merge commit '
88b240646f57a62299c6c4c4d7554f0a80c3a29a '
* commit '
88b240646f57a62299c6c4c4d7554f0a80c3a29a ':
build: Drop stray mpc8 decoder dependency on dsputil
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 20:01:14 +0000 (21:01 +0100)]
Merge commit '
fb9a5bdc516b75b4ba1e36ca2223dec46571dea3 '
* commit '
fb9a5bdc516b75b4ba1e36ca2223dec46571dea3 ':
Prepare for 11_alpha1 Release
Conflicts:
RELEASE
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 16:32:15 +0000 (17:32 +0100)]
avutil/timestamp: Warn about missing __STDC_FORMAT_MACROS for C++ use
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 14 Feb 2014 10:41:49 +0000 (11:41 +0100)]
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.
Diego Biurrun [Wed, 22 Jan 2014 16:54:21 +0000 (08:54 -0800)]
bfin: hpeldsp: Split no_rnd pixel operations off into a separate file
This saves some space in configurations that do not enable hpeldsp.
Diego Biurrun [Wed, 22 Jan 2014 15:47:26 +0000 (07:47 -0800)]
bfin: dsputil: Unconditionally compile hpel pixels code
The functions it contains are used from unconditionally compiled code.
Diego Biurrun [Wed, 22 Jan 2014 16:46:16 +0000 (08:46 -0800)]
bfin: hpeldsp: "nornd" ---> "no_rnd" function name suffix for consistency
Diego Biurrun [Tue, 21 Jan 2014 23:50:26 +0000 (15:50 -0800)]
bfin: Move all assembly declarations only used within one .c file there
This is done similarly for all other architectures.
Diego Biurrun [Wed, 22 Jan 2014 16:07:26 +0000 (08:07 -0800)]
bfin: hpeldsp: K&R formatting cosmetics
Diego Biurrun [Wed, 22 Jan 2014 13:21:02 +0000 (05:21 -0800)]
bfin: Refactor duplicated assembly-related macros
Diego Biurrun [Wed, 22 Jan 2014 10:54:14 +0000 (02:54 -0800)]
bfin: Refactor duplicated l1_text/l1_data_B macros
Diego Biurrun [Mon, 6 Jan 2014 09:35:37 +0000 (10:35 +0100)]
bfin: dsputil: K&R formatting cosmetics
Also add a few #endif comments.
Diego Biurrun [Sun, 19 Jan 2014 21:01:19 +0000 (13:01 -0800)]
bfin: dsputil: Drop broken and trivial profiling code
Diego Biurrun [Mon, 6 Jan 2014 09:39:57 +0000 (10:39 +0100)]
bfin: hpeldsp: Drop broken put_pixels_*_xy2_nornd bits
They were marked as broken and disabled in 2009 and will never get fixed.
Diego Biurrun [Mon, 6 Jan 2014 09:30:13 +0000 (10:30 +0100)]
bfin: dsputil: Drop broken vsad bits
They were marked as broken and disabled in 2009 and will never get fixed.
Diego Biurrun [Fri, 20 Dec 2013 14:30:53 +0000 (15:30 +0100)]
bfin: dsputil: Remove unused global variable
Diego Biurrun [Fri, 10 Jan 2014 10:29:25 +0000 (11:29 +0100)]
x86: dsputil_init: Drop some unnecessary parentheses
Diego Biurrun [Wed, 8 Jan 2014 13:06:18 +0000 (14:06 +0100)]
x86: dsputil_init: K&R formatting cosmetics
Diego Biurrun [Fri, 31 Jan 2014 07:15:56 +0000 (23:15 -0800)]
x86: dsputil_x86.h: K&R formatting cosmetics
Diego Biurrun [Fri, 17 Jan 2014 14:45:07 +0000 (15:45 +0100)]
x86: motion_est: K&R formatting cosmetics
Diego Biurrun [Wed, 25 Dec 2013 15:48:32 +0000 (16:48 +0100)]
dsputilenc_mmx: K&R formatting cosmetics
Diego Biurrun [Wed, 25 Dec 2013 14:49:31 +0000 (15:49 +0100)]
dsputil_mmx: K&R formatting cosmetics
Diego Biurrun [Wed, 25 Dec 2013 15:49:23 +0000 (16:49 +0100)]
dsputilenc_mmx: Merge two assignment blocks with identical conditions
Diego Biurrun [Sat, 21 Dec 2013 11:24:12 +0000 (12:24 +0100)]
dsputil_template: K&R formatting cosmetics
Diego Biurrun [Sat, 21 Dec 2013 16:10:22 +0000 (17:10 +0100)]
rnd_avg.h: K&R formatting cosmetics
Diego Biurrun [Sun, 22 Dec 2013 13:32:11 +0000 (14:32 +0100)]
dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names
Also switch from "tbl" to "tab" name suffixes.
Diego Biurrun [Fri, 20 Dec 2013 12:58:18 +0000 (13:58 +0100)]
dsputil: Merge variable declarations and initializations
Diego Biurrun [Thu, 19 Dec 2013 17:28:50 +0000 (18:28 +0100)]
dsputil: K&R formatting cosmetics
Diego Biurrun [Sun, 22 Dec 2013 16:50:07 +0000 (17:50 +0100)]
dsputil.h: K&R formatting cosmetics
Diego Biurrun [Sun, 22 Dec 2013 16:49:52 +0000 (17:49 +0100)]
dsputil.h: Clean up comments
Diego Biurrun [Tue, 7 Jan 2014 22:51:08 +0000 (23:51 +0100)]
dsputil: Remove disabled avg_no_rnd_qpel leftovers
Michael Niedermayer [Thu, 13 Mar 2014 14:00:49 +0000 (15:00 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix hardware detection on aix.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Mar 2014 13:16:00 +0000 (14:16 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: Match stream id
Conflicts:
cmdutils.c
doc/fftools-common-opts.texi
See:
ea07063fd82686af3fabb45e5ed10aa48d084d61
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 28 Jan 2014 19:35:58 +0000 (20:35 +0100)]
x86: Make function prototype comments in assembly code consistent
This helps grepping for functions, among other things.
Diego Biurrun [Wed, 18 Dec 2013 20:12:02 +0000 (21:12 +0100)]
x86: h264_idct_10_bit: Use proper type in function prototype comments
Diego Biurrun [Wed, 29 Jan 2014 12:12:59 +0000 (13:12 +0100)]
Update dsputil- and SIMD-related comments to match reality more closely
Diego Biurrun [Wed, 12 Feb 2014 20:28:44 +0000 (21:28 +0100)]
arm: dsputil: Add a bunch of missing #includes
Diego Biurrun [Wed, 29 Jan 2014 12:07:57 +0000 (13:07 +0100)]
x86: Add some more missing headers
Diego Biurrun [Fri, 17 Jan 2014 16:38:05 +0000 (08:38 -0800)]
ppc: Add some missing headers
Diego Biurrun [Mon, 10 Feb 2014 17:58:28 +0000 (18:58 +0100)]
dsputil: Move intreadwrite.h #include from header file to .c files
Diego Biurrun [Mon, 27 Jan 2014 17:37:40 +0000 (18:37 +0100)]
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.