Peter Ross
ac9bfb1faf
avformat/movenc: encode compilation metadata
...
Fixes ticket #2960 .
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-15 04:29:11 +01:00
Peter Ross
dadf668df2
avformat/mov: decode compilation metadata
...
This flag is known as 'Part of a compilation' in Apple iTunes.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-15 04:28:58 +01:00
Peter Ross
d1bb17940d
avcodec/adpcm: ADPCM_IMA_DK3 packets are padded to 16-bit packet boundary
...
Fixes ticket #3461 .
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-15 01:34:42 +01:00
Michael Niedermayer
41d08ca575
avcodec/arm/cabac: fix inline cabac reader with the UNCHECKED bitstream reader
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-15 01:08:45 +01:00
Michael Niedermayer
2b8d28439b
avcodec/h264_cabac: move the arm unchecked_bitstream reader special case closer to where the issue is
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-15 01:02:31 +01:00
Michael Niedermayer
669235e0b3
avcodec/h264_cabac: disable the unchecked bitstream reader for arm & aarch64
...
The newly added optimizations do not work with the unchecked reader
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-15 00:58:48 +01:00
Yu Xiaolei
fbe9ae482d
avfilter: make avfilter_graph_get_filter use const string name
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 23:18:59 +01:00
Michael Niedermayer
c17dea05f7
configure: factorize mips arch extensions out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 19:49:02 +01:00
Michael Niedermayer
f6122ed375
configure: remove unused identifer that was added by cleanups
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 19:47:46 +01:00
Michael Niedermayer
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>
2014-03-14 19:36:46 +01:00
Michael Niedermayer
4d10b93bd1
Merge commit 'd42ea06798b83d87397449ec6aad40cb5ea46e43'
...
* commit 'd42ea06798b83d87397449ec6aad40cb5ea46e43':
codec_desc: add missing .long_name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 19:24:09 +01:00
Michael Niedermayer
11e66d20d5
Merge commit '999d31d354f1f0616a09691913659ac0abdcc899'
...
* commit '999d31d354f1f0616a09691913659ac0abdcc899':
codec_desc: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 19:16:04 +01:00
Michael Niedermayer
56a498bbba
Merge commit '7a650caf6436ddfe417bdcb5ce520c96c779af7b'
...
* commit '7a650caf6436ddfe417bdcb5ce520c96c779af7b':
configure: Split some logical blocks off from HAVE_LIST
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 19:08:14 +01:00
Michael Niedermayer
332f169855
Merge commit 'd0adf55c05beaf80420747dded2d1884bff377ec'
...
* commit 'd0adf55c05beaf80420747dded2d1884bff377ec':
configure: Split some logical blocks off from CONFIG_LIST
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 18:40:29 +01:00
Michael Niedermayer
2b94189e96
Merge commit '07ea8a7e943ea6a7bdcd736e2fc3ed357dc15c57'
...
* commit '07ea8a7e943ea6a7bdcd736e2fc3ed357dc15c57':
configure: Group and sort function/struct/type checks
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 18:30:03 +01:00
Michael Niedermayer
5e5d8ace8a
Merge commit '36b822b8be7f9ecd6f9d87acaa786b128a873cd9'
...
* commit '36b822b8be7f9ecd6f9d87acaa786b128a873cd9':
arm: dsputil: Drop restrict keyword from add_pixels_clamped_armv6 prototype
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 18:25:04 +01:00
Vittorio Giovara
f20977921b
codec_desc: group image codecs together
2014-03-14 17:50:35 +01:00
Vittorio Giovara
d42ea06798
codec_desc: add missing .long_name
2014-03-14 17:50:35 +01:00
Vittorio Giovara
999d31d354
codec_desc: K&R formatting cosmetics
2014-03-14 17:50:34 +01:00
James Almer
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>
2014-03-14 17:28:00 +01:00
Peter Ross
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>
2014-03-14 17:21:59 +01:00
Michael Niedermayer
2c9e5cb1a6
avcodec/arm/fft_fixed_neon: reduce diff by 2 spaces to libav
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 14:28:28 +01:00
Diego Biurrun
7a650caf64
configure: Split some logical blocks off from HAVE_LIST
2014-03-14 13:45:40 +01:00
Diego Biurrun
d0adf55c05
configure: Split some logical blocks off from CONFIG_LIST
2014-03-14 13:45:40 +01:00
Diego Biurrun
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.
2014-03-14 13:45:40 +01:00
Diego Biurrun
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
.
2014-03-14 13:45:40 +01:00
Michael Niedermayer
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>
2014-03-14 12:00:45 +01:00
Michael Niedermayer
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>
2014-03-14 11:52:28 +01:00
Michael Niedermayer
dded5ed9c5
avcodec/libx265: fill headers in extradata
...
Fixes Ticket3457
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 04:26:24 +01:00
Michael Niedermayer
f3d3e3fa4e
Merge commit 'eb2b8bce39c93d16a02656238248c6cf697f447f'
...
* commit 'eb2b8bce39c93d16a02656238248c6cf697f447f':
bfin: Use more sensible file names
Conflicts:
libavcodec/bfin/pixels.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 02:12:45 +01:00
Michael Niedermayer
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>
2014-03-14 02:06:21 +01:00
Michael Niedermayer
26f4a50982
Merge commit 'a7cc4ac9d99bd586c8939f4312f8c9e56d5f5730'
...
* commit 'a7cc4ac9d99bd586c8939f4312f8c9e56d5f5730':
bfin: dsputil: Unconditionally compile hpel pixels code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 02:04:56 +01:00
Michael Niedermayer
866e11b33b
Merge commit '13ae97b210f35d77290f4edb0d6846269271729a'
...
* commit '13ae97b210f35d77290f4edb0d6846269271729a':
bfin: hpeldsp: "nornd" ---> "no_rnd" function name suffix for consistency
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 02:04:42 +01:00
Michael Niedermayer
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>
2014-03-14 01:57:41 +01:00
Michael Niedermayer
cbf190f7ae
Merge commit '80173c71bab3b8817c148837bdc920557018f428'
...
* commit '80173c71bab3b8817c148837bdc920557018f428':
bfin: hpeldsp: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 01:56:45 +01:00
Michael Niedermayer
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>
2014-03-14 01:56:25 +01:00
Michael Niedermayer
91a61c4c15
Merge commit 'e99af2a3b1660b4f328335149980064692097cad'
...
* commit 'e99af2a3b1660b4f328335149980064692097cad':
bfin: Refactor duplicated l1_text/l1_data_B macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 01:49:44 +01:00
Michael Niedermayer
edf4261350
Merge commit 'a3e7562621bd96ce909e07149c419b6ba85cc54f'
...
* commit 'a3e7562621bd96ce909e07149c419b6ba85cc54f':
bfin: dsputil: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 01:48:57 +01:00
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
Luca Barbato
afdf94689c
aac: K&R formatting cosmetics
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-03-14 01:24:31 +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