]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sun, 16 Mar 2014 23:06:45 +0000 (00:06 +0100)]
swscale/x86/swscale: remove unused constants
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Mar 2014 21:38:00 +0000 (22:38 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacdec: Lower the number of frames required to detect ADTS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Mar 2014 21:25:09 +0000 (22:25 +0100)]
Merge commit '
0412cb67cda05b08dfca6bfc4ff664ea917fa932 '
* commit '
0412cb67cda05b08dfca6bfc4ff664ea917fa932 ':
aacdec: Don't count probed ADTS frames if there are false positives
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Tue, 11 Mar 2014 13:52:46 +0000 (15:52 +0200)]
aacdec: Lower the number of frames required to detect ADTS
For live audio streams, requiring 500 frames for a stream to
be detected is a bit overkill.
This allows live ADTS streams that don't start nicely at
a frame boundary to start up more quickly, e.g.
http://mp3.streampower.be/radio1.aac.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Mar 2014 13:42:44 +0000 (15:42 +0200)]
aacdec: Don't count probed ADTS frames if there are false positives
If a portion of the probe buffer seem to resemble ADTS frames,
but some data at the end is a mismatch, disregard the whole
probing attempt. If it actually is ADTS data, there shouldn't be
any mismatches within the sequential frame data.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sun, 16 Mar 2014 18:15:58 +0000 (19:15 +0100)]
Changelog: move post 2.2 branching entries out of the 2.2 changelog
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sat, 15 Mar 2014 06:28:01 +0000 (17:28 +1100)]
Phantom Cine demuxer (iteration 2014.3)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sat, 15 Mar 2014 06:26:58 +0000 (17:26 +1100)]
avcodec/rawdec: decode 16-bit aligned and packed 'raw' pixel formats where bits_per_coded_sample < 16
The bit packing method is communicted via codec_tag:
BIT[0] big-endian packing
BIT[16] 16-bit little endian packing
BIT[32] 32-bit little-endian packing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jasper Taylor [Sun, 16 Mar 2014 15:29:30 +0000 (15:29 +0000)]
avfilter/vf_tinterlace: Fix vf_tinterlace mode 6 (interlacex2)
The purpose of this filter mode is to allow interlaced content to
display properly in interlaced video modes, as described in
http://forum.xbmc.org/showthread.php?tid=81834 and
https://github.com/mpv-player/mpv/issues/624#issuecomment-
37685195 . The
filter doubles the video frame rate, but does not work properly because:
(1) it does not set the properties of the output stream to indicate the
doubled frame rate, and
(2) it does not set an appropriate PTS on the extra frames.
The attached patch fixes these problems by settling these values the
same way they are set in vf_yadif mode 1 (field) which also doubles the
frame rate.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Mar 2014 15:34:46 +0000 (16:34 +0100)]
avformat/movenc: omit avformat ident from isml_manifest for bitexact mode
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Mar 2014 15:32:03 +0000 (16:32 +0100)]
avformat/movenc: omit LIBAVCODEC_IDENT for bitexact mode from uuidusmt_tag
This code is apparently not tested by fate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Mar 2014 15:26:04 +0000 (16:26 +0100)]
avformat/movenc: only ommit encoder tag of the metadata for bitexact mode
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Mar 2014 14:15:02 +0000 (15:15 +0100)]
ffmpeg_opt: check that a subtitle encoder is available before auto mapping streams
Fixes Ticket3470
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Mar 2014 13:32:47 +0000 (14:32 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: add a test for the ONE_STR mapping mode of the channelmap filter
Conflicts:
tests/fate/filter-audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Mar 2014 13:17:41 +0000 (14:17 +0100)]
Merge commit '
e843612695007cc623813073754c651ab43021f7 '
* commit '
e843612695007cc623813073754c651ab43021f7 ':
af_channelmap: fix ONE_STR mapping mode
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Mar 2014 13:05:14 +0000 (14:05 +0100)]
avformat/isom: fix mix of declaration and statement
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Mar 2014 12:33:55 +0000 (13:33 +0100)]
Merge commit '
8f629a986c46f227abda1811a6ad1f449871ca35 '
* commit '
8f629a986c46f227abda1811a6ad1f449871ca35 ':
isom: convert mp4 dvdsub extradata to vobsub format
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Tue, 4 Mar 2014 06:31:47 +0000 (07:31 +0100)]
FATE: add a test for the ONE_STR mapping mode of the channelmap filter
Anton Khirnov [Tue, 4 Mar 2014 06:19:46 +0000 (07:19 +0100)]
af_channelmap: fix ONE_STR mapping mode
get_channel() returns 0 on success
CC:libav-stable@libav.org
Michael Niedermayer [Thu, 6 Mar 2014 03:30:07 +0000 (04:30 +0100)]
ffmpeg: fix printing INT64_MIN pts at the end
Fixes Ticket3427
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 15 Mar 2014 21:52:22 +0000 (22:52 +0100)]
swscale/x86/swscale: fix missing xmm clobbers in yuv2yuvX_sse3()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 15 Mar 2014 21:14:08 +0000 (22:14 +0100)]
ffmpeg_opt: Check ist is valid before using it in audio_channels_map init
Fixes segfault and instead provides an error message
Fixes Ticket3465
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 15 Mar 2014 13:50:37 +0000 (14:50 +0100)]
avcodec/mpegvideo_enc: dont use direct mode for unaligned input
Fixes Ticket3456
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 15 Mar 2014 13:47:04 +0000 (14:47 +0100)]
avcodec: Move STRIDE_ALIGN to internal.h
The next commit/bugfix will need it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wm4 [Wed, 12 Mar 2014 20:18:46 +0000 (21:18 +0100)]
isom: convert mp4 dvdsub extradata to vobsub format
mp4 files embedding DVD subtitles do not use the same extradata format
as the rest of Libav expects. The subtitle decoder in libavcodec in
particular does not understand this format.
Convert the extradata to the vobsub .idx format. mp4 stores the palette
as binary 32 bit ints in YUV. The subtitle resolution is stored
separately in the track header, which we access through AVStream.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Peter Ross [Sat, 15 Mar 2014 01:26:22 +0000 (12:26 +1100)]
avformat/id3v2: decode compilation metadata
Described http://id3.org/iTunes%20Compilation%20Flag
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sat, 15 Mar 2014 01:26:14 +0000 (12:26 +1100)]
avformat/movenc: encode compilation metadata
Fixes ticket #2960.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sat, 15 Mar 2014 01:25:59 +0000 (12:25 +1100)]
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>
Peter Ross [Sat, 15 Mar 2014 00:16:19 +0000 (11:16 +1100)]
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>
Michael Niedermayer [Sat, 15 Mar 2014 00:08:45 +0000 (01:08 +0100)]
avcodec/arm/cabac: fix inline cabac reader with the UNCHECKED bitstream reader
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 15 Mar 2014 00:02:31 +0000 (01:02 +0100)]
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>
Michael Niedermayer [Fri, 14 Mar 2014 23:12:01 +0000 (00:12 +0100)]
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>
Yu Xiaolei [Fri, 14 Mar 2014 04:25:07 +0000 (12:25 +0800)]
avfilter: make avfilter_graph_get_filter use const string name
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 18:49:02 +0000 (19:49 +0100)]
configure: factorize mips arch extensions out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 18:47:46 +0000 (19:47 +0100)]
configure: remove unused identifer that was added by cleanups
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 18:36:46 +0000 (19:36 +0100)]
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>
Michael Niedermayer [Fri, 14 Mar 2014 18:23:57 +0000 (19:23 +0100)]
Merge commit '
d42ea06798b83d87397449ec6aad40cb5ea46e43 '
* commit '
d42ea06798b83d87397449ec6aad40cb5ea46e43 ':
codec_desc: add missing .long_name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 18:15:57 +0000 (19:15 +0100)]
Merge commit '
999d31d354f1f0616a09691913659ac0abdcc899 '
* commit '
999d31d354f1f0616a09691913659ac0abdcc899 ':
codec_desc: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 18:08:14 +0000 (19:08 +0100)]
Merge commit '
7a650caf6436ddfe417bdcb5ce520c96c779af7b '
* commit '
7a650caf6436ddfe417bdcb5ce520c96c779af7b ':
configure: Split some logical blocks off from HAVE_LIST
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 17:39:10 +0000 (18:39 +0100)]
Merge commit '
d0adf55c05beaf80420747dded2d1884bff377ec '
* commit '
d0adf55c05beaf80420747dded2d1884bff377ec ':
configure: Split some logical blocks off from CONFIG_LIST
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Mar 2014 17:30:03 +0000 (18:30 +0100)]
Merge commit '
07ea8a7e943ea6a7bdcd736e2fc3ed357dc15c57 '
* commit '
07ea8a7e943ea6a7bdcd736e2fc3ed357dc15c57 ':
configure: Group and sort function/struct/type checks
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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>
Vittorio Giovara [Fri, 14 Mar 2014 00:17:15 +0000 (01:17 +0100)]
codec_desc: group image codecs together
Vittorio Giovara [Fri, 14 Mar 2014 00:03:05 +0000 (01:03 +0100)]
codec_desc: add missing .long_name
Vittorio Giovara [Fri, 14 Mar 2014 00:00:49 +0000 (01:00 +0100)]
codec_desc: K&R formatting cosmetics
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 [Thu, 6 Mar 2014 17:31:45 +0000 (18:31 +0100)]
configure: Split some logical blocks off from HAVE_LIST
Diego Biurrun [Sat, 2 Nov 2013 16:21:51 +0000 (17:21 +0100)]
configure: Split some logical blocks off from CONFIG_LIST
Diego Biurrun [Thu, 6 Mar 2014 13:52:03 +0000 (14:52 +0100)]
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.
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>