fbe9ae482d
avfilter: make avfilter_graph_get_filter use const string name
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
c17dea05f7
configure: factorize mips arch extensions out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
f6122ed375
configure: remove unused identifer that was added by cleanups
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
a8a84fa8b2
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
codec_desc: group image codecs together
Conflicts:
libavcodec/codec_desc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
4d10b93bd1
Merge commit 'd42ea06798b83d87397449ec6aad40cb5ea46e43'
...
* commit 'd42ea06798b83d87397449ec6aad40cb5ea46e43':
codec_desc: add missing .long_name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
11e66d20d5
Merge commit '999d31d354f1f0616a09691913659ac0abdcc899'
...
* commit '999d31d354f1f0616a09691913659ac0abdcc899':
codec_desc: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
56a498bbba
Merge commit '7a650caf6436ddfe417bdcb5ce520c96c779af7b'
...
* commit '7a650caf6436ddfe417bdcb5ce520c96c779af7b':
configure: Split some logical blocks off from HAVE_LIST
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
332f169855
Merge commit 'd0adf55c05beaf80420747dded2d1884bff377ec'
...
* commit 'd0adf55c05beaf80420747dded2d1884bff377ec':
configure: Split some logical blocks off from CONFIG_LIST
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
2b94189e96
Merge commit '07ea8a7e943ea6a7bdcd736e2fc3ed357dc15c57'
...
* commit '07ea8a7e943ea6a7bdcd736e2fc3ed357dc15c57':
configure: Group and sort function/struct/type checks
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
5e5d8ace8a
Merge commit '36b822b8be7f9ecd6f9d87acaa786b128a873cd9'
...
* commit '36b822b8be7f9ecd6f9d87acaa786b128a873cd9':
arm: dsputil: Drop restrict keyword from add_pixels_clamped_armv6 prototype
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
f20977921b
codec_desc: group image codecs together
11 years ago
d42ea06798
codec_desc: add missing .long_name
11 years ago
999d31d354
codec_desc: K&R formatting cosmetics
11 years ago
722b48bc12
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>
11 years ago
7380201451
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>
11 years ago
2c9e5cb1a6
avcodec/arm/fft_fixed_neon: reduce diff by 2 spaces to libav
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
7a650caf64
configure: Split some logical blocks off from HAVE_LIST
11 years ago
d0adf55c05
configure: Split some logical blocks off from CONFIG_LIST
11 years ago
07ea8a7e94
configure: Group and sort function/struct/type checks
...
Group checks into logical groups and sort alphabetically within those groups
unless checks have close coupling. Keep closely coupled checks together.
11 years ago
36b822b8be
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
11 years ago
b5bdd04f08
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
aac: K&R formatting cosmetics
Conflicts:
libavformat/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
0c402810fa
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>
11 years ago
dded5ed9c5
avcodec/libx265: fill headers in extradata
...
Fixes Ticket3457
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
f3d3e3fa4e
Merge commit 'eb2b8bce39c93d16a02656238248c6cf697f447f'
...
* commit 'eb2b8bce39c93d16a02656238248c6cf697f447f':
bfin: Use more sensible file names
Conflicts:
libavcodec/bfin/pixels.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
be60e20498
Merge commit '929ec39ec4497827f7530f2aaa31646ef35462ee'
...
* commit '929ec39ec4497827f7530f2aaa31646ef35462ee':
bfin: hpeldsp: Split no_rnd pixel operations off into a separate file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
26f4a50982
Merge commit 'a7cc4ac9d99bd586c8939f4312f8c9e56d5f5730'
...
* commit 'a7cc4ac9d99bd586c8939f4312f8c9e56d5f5730':
bfin: dsputil: Unconditionally compile hpel pixels code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
866e11b33b
Merge commit '13ae97b210f35d77290f4edb0d6846269271729a'
...
* commit '13ae97b210f35d77290f4edb0d6846269271729a':
bfin: hpeldsp: "nornd" ---> "no_rnd" function name suffix for consistency
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
c49797637f
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>
11 years ago
cbf190f7ae
Merge commit '80173c71bab3b8817c148837bdc920557018f428'
...
* commit '80173c71bab3b8817c148837bdc920557018f428':
bfin: hpeldsp: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
3141b04c7f
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>
11 years ago
91a61c4c15
Merge commit 'e99af2a3b1660b4f328335149980064692097cad'
...
* commit 'e99af2a3b1660b4f328335149980064692097cad':
bfin: Refactor duplicated l1_text/l1_data_B macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
edf4261350
Merge commit 'a3e7562621bd96ce909e07149c419b6ba85cc54f'
...
* commit 'a3e7562621bd96ce909e07149c419b6ba85cc54f':
bfin: dsputil: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
a4369dbb8f
Merge commit '1e33095b83addd8d24bc16bd08aa734fa161d515'
...
* commit '1e33095b83addd8d24bc16bd08aa734fa161d515':
bfin: dsputil: Drop broken and trivial profiling code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
2b02c1a698
Merge commit 'f5f099766816aab3ad805c63e85f12cb664dc9a8'
...
* commit 'f5f099766816aab3ad805c63e85f12cb664dc9a8':
bfin: hpeldsp: Drop broken put_pixels_*_xy2_nornd bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
c686cf23aa
Merge commit '14efbe694ac5beff98f5c5e652c166603f1738cf'
...
* commit '14efbe694ac5beff98f5c5e652c166603f1738cf':
bfin: dsputil: Drop broken vsad bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
0f95856834
Merge commit '671c8785596ea4a45817ba302289004ff456630a'
...
* commit '671c8785596ea4a45817ba302289004ff456630a':
bfin: dsputil: Remove unused global variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
5dd97d5809
Merge commit 'db3f61a04f1f66746660f921bb2780ddf1141f3b'
...
* commit 'db3f61a04f1f66746660f921bb2780ddf1141f3b':
x86: dsputil_init: Drop some unnecessary parentheses
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
27cab16ce7
Merge commit '441b093915717afa7d24be34bdab2a4911b30a57'
...
* commit '441b093915717afa7d24be34bdab2a4911b30a57':
x86: dsputil_init: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
236874a571
Merge commit '4cb4680c1087a2cd13d4b0c9167a2eb3147f99d8'
...
* commit '4cb4680c1087a2cd13d4b0c9167a2eb3147f99d8':
x86: dsputil_x86.h: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
afdf94689c
aac: K&R formatting cosmetics
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
11 years ago
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>
11 years ago
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>
11 years ago
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>
11 years ago
55f53f6c29
Merge commit '6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23'
...
* commit '6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23':
dsputilenc_mmx: Merge two assignment blocks with identical conditions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
fdf4eb7911
Merge commit '945673f792eb4141860ed66664156df685f7b7f0'
...
* commit '945673f792eb4141860ed66664156df685f7b7f0':
dsputil_template: K&R formatting cosmetics
Conflicts:
libavcodec/dsputil_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
3a27f968f9
Merge commit 'acd2b8e42df25d46440583f93c12e5f285aebb31'
...
* commit 'acd2b8e42df25d46440583f93c12e5f285aebb31':
rnd_avg.h: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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>
11 years ago
16f619f57c
Merge commit '635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150'
...
* commit '635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150':
dsputil: Merge variable declarations and initializations
Conflicts:
libavcodec/dsputil_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
dd7c2e9bce
Merge commit 'bb12c2e9c00e3d3c393885849b8fa31cd849dc92'
...
* commit 'bb12c2e9c00e3d3c393885849b8fa31cd849dc92':
dsputil: K&R formatting cosmetics
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
db94b144e9
Merge commit '503dda7d4f5b4d76eed0239e9da66993a182b009'
...
* commit '503dda7d4f5b4d76eed0239e9da66993a182b009':
dsputil.h: K&R formatting cosmetics
Conflicts:
libavcodec/dsputil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Yu Xiaolei
Michael Niedermayer
Vittorio Giovara
James Almer
Peter Ross
Diego Biurrun
Luca Barbato