]>
git.sesse.net Git - ffmpeg/log
Donny Yang [Sun, 19 Jul 2015 20:20:56 +0000 (20:20 +0000)]
avcodec/apngdec: Fix typos in decoder causing incorrect results
Signed-off-by: Donny Yang <work@kota.moe>
周晓勇 [Mon, 20 Jul 2015 05:45:49 +0000 (13:45 +0800)]
avcodec: loongson relocate constants of idctdsp and h264pred
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
周晓勇 [Mon, 20 Jul 2015 03:25:48 +0000 (11:25 +0800)]
avcodec: loongson constants redefined with macros
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sun, 19 Jul 2015 19:36:46 +0000 (19:36 +0000)]
avfilter/af_amerge: increase max number of channels from 32 to 64
Signed-off-by: Paul B Mahol <onemda@gmail.com>
James Almer [Mon, 20 Jul 2015 03:04:38 +0000 (00:04 -0300)]
avfilter/af_astats: use UINT64_C instead of the LLU suffix
Should fix compilation with vs2012
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Mon, 20 Jul 2015 02:32:28 +0000 (04:32 +0200)]
Merge commit '
e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2 '
* commit '
e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2 ':
parseutil: Add more resolution aliases
Conflicts:
doc/ffmpeg.texi
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Luca Barbato [Thu, 16 Jul 2015 22:31:54 +0000 (00:31 +0200)]
parseutil: Add more resolution aliases
Add DCI 2k and 4k and uhd1 and uhd2.
Michael Niedermayer [Mon, 20 Jul 2015 00:41:44 +0000 (02:41 +0200)]
avformat/mp3dec: Rename sync() function to avoid build failure on android
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 20 Jul 2015 00:10:40 +0000 (02:10 +0200)]
avformat/avidec: Fix demuxing avi with broken index
Fixes: genio-avi
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 20 Jul 2015 00:10:04 +0000 (02:10 +0200)]
avcodec/ffv1enc: fix assertion failure with unset bits per raw sample
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Carl Eugen Hoyos [Sun, 19 Jul 2015 20:34:13 +0000 (22:34 +0200)]
lavc/jpeg2000: Signal lossless / bit-exact video stream.
Carl Eugen Hoyos [Sun, 19 Jul 2015 20:32:17 +0000 (22:32 +0200)]
lavf/rtpenc_jpeg: Warn if number of present quantization tables is not two.
Carl Eugen Hoyos [Sun, 19 Jul 2015 20:31:23 +0000 (22:31 +0200)]
lavc: Improve documentation for rc_max_rate and bit_rate.
Both may be set by user (libavformat) on decoding.
Michael Niedermayer [Sun, 19 Jul 2015 22:03:11 +0000 (00:03 +0200)]
avcodec/dds: Flip more R<->B cases
Fixes Ticket4665
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 19 Jul 2015 20:55:16 +0000 (22:55 +0200)]
avcodec/dds: fix paletted files
Fixes Ticket4664
The changed fate tests lack red/blue shades and thus look correct
either way
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Sun, 19 Jul 2015 20:52:10 +0000 (17:52 -0300)]
RELEASE: update to 2.7.git
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sun, 19 Jul 2015 20:47:01 +0000 (17:47 -0300)]
avformat/mp3dec: remove unused variable
Signed-off-by: James Almer <jamrial@gmail.com>
Paul B Mahol [Wed, 15 Jul 2015 01:48:37 +0000 (01:48 +0000)]
avfilter: add random video filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Chris Spencer [Sat, 18 Jul 2015 19:20:25 +0000 (20:20 +0100)]
avdevice/decklink: Add missing libraries when building with DeckLink support on Windows.
Signed-off-by: Chris Spencer <spencercw@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Vesselin Bontchev [Sat, 11 Jul 2015 18:02:47 +0000 (18:02 +0000)]
Add support for Audible AAX (and AAX+) files
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 19 Jul 2015 17:31:08 +0000 (19:31 +0200)]
avformat/mp3dec: split position sync code out
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 19 Jul 2015 16:17:18 +0000 (18:17 +0200)]
avcodec/utils: Check that channel count is valid in avcodec_open2();
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 19 Jul 2015 14:34:12 +0000 (16:34 +0200)]
Merge commit '
69b92f1b99f3f210be19ee6ec06f6c0de1733031 '
* commit '
69b92f1b99f3f210be19ee6ec06f6c0de1733031 ':
qsvenc: properly handle asynchronous encoding
Conflicts:
libavcodec/qsvenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 19 Jul 2015 14:13:35 +0000 (16:13 +0200)]
Merge commit '
f5c4d38c78347b09478e21a661befff4b2d44643 '
* commit '
f5c4d38c78347b09478e21a661befff4b2d44643 ':
qsvdec: properly handle asynchronous decoding
Conflicts:
libavcodec/qsvdec.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 19 Jul 2015 13:45:15 +0000 (15:45 +0200)]
Merge commit '
6b15874fc2c3f565732201f7907ae1112727d6ae '
* commit '
6b15874fc2c3f565732201f7907ae1112727d6ae ':
af_resample: do not touch the timestamps if we are not resampling
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 19 Jul 2015 12:56:09 +0000 (14:56 +0200)]
ffmpeg_filter: Check that filters have connected outputs before accessing the output stream
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 19 Jul 2015 12:24:19 +0000 (14:24 +0200)]
Merge commit '
6d592fbd0d8e89ecade3fc93b36ea200213dc01c '
* commit '
6d592fbd0d8e89ecade3fc93b36ea200213dc01c ':
avconv: split creating and (re-)configuring complex filtergraphs
Conflicts:
ffmpeg_filter.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Derek Buitenhuis [Thu, 16 Jul 2015 17:43:59 +0000 (17:43 +0000)]
avfilter: Add reverse filter
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Sun, 19 Jul 2015 12:12:11 +0000 (14:12 +0200)]
Merge commit '
be101bc1e357c50fcb740bc4870b3bacc93a5727 '
* commit '
be101bc1e357c50fcb740bc4870b3bacc93a5727 ':
avconv: create the complex filtergraphs earlier
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 19 Jul 2015 12:01:06 +0000 (14:01 +0200)]
Merge commit '
1959351aecf09fc3e90208ff775f4849801dc13f '
* commit '
1959351aecf09fc3e90208ff775f4849801dc13f ':
avconv: move the no streams failure to open_output_file()
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 19 Jul 2015 11:50:33 +0000 (13:50 +0200)]
Merge commit '
ab7b038906f3e40ed474676d8e3029902a2078f5 '
* commit '
ab7b038906f3e40ed474676d8e3029902a2078f5 ':
avconv: factor out the output stream initialization
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 19 Jul 2015 11:33:44 +0000 (13:33 +0200)]
Merge commit '
bd2ab27c488ae92c7820efe11d4f53d84e94d58e '
* commit '
bd2ab27c488ae92c7820efe11d4f53d84e94d58e ':
avconv: use read_file() for reading the 2pass stats
Conflicts:
cmdutils.c
cmdutils.h
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 19 Jul 2015 10:57:32 +0000 (12:57 +0200)]
Merge commit '
6d5d9246042acb804a652e6fedfb7afe0ca85614 '
* commit '
6d5d9246042acb804a652e6fedfb7afe0ca85614 ':
avconv: move handling the 2pass logfile into avconv_opt
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 19 Jul 2015 10:44:07 +0000 (12:44 +0200)]
Merge commit '
59245e0c5e10a849e67c632cccf4f677b2442e82 '
* commit '
59245e0c5e10a849e67c632cccf4f677b2442e82 ':
avconv: set the encoding/decoding_needed flags earlier
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 19 Jul 2015 10:35:10 +0000 (12:35 +0200)]
ffmpeg_opt: Fix stream copy flag for attachments
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 19 Jul 2015 09:57:34 +0000 (11:57 +0200)]
Merge commit '
56c2f37727015212a404cae0f444d8bc8704d691 '
* commit '
56c2f37727015212a404cae0f444d8bc8704d691 ':
avconv: drop update_sample_fmt()
Conflicts:
ffmpeg.c
No change as the removed code is not in FFmpeg
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 19 Jul 2015 09:45:29 +0000 (11:45 +0200)]
Merge commit '
e61f39849c2e2b7f492c17b42058242ed2fa4d57 '
* commit '
e61f39849c2e2b7f492c17b42058242ed2fa4d57 ':
asfdec: make nb_sub to be unsigned int
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 19 Jul 2015 09:38:33 +0000 (11:38 +0200)]
Merge commit '
2883ef34b59c9b427c4cfad4620c3235e5778406 '
* commit '
2883ef34b59c9b427c4cfad4620c3235e5778406 ':
asfdec: read the replicated data in a separate function
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 19 Jul 2015 09:29:49 +0000 (11:29 +0200)]
Merge commit '
0989d3ad1fbd7509815208b0a5792918492d2a68 '
* commit '
0989d3ad1fbd7509815208b0a5792918492d2a68 ':
asfdec: convert condition for the replicated data reading to be safer
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 19 Jul 2015 09:22:57 +0000 (11:22 +0200)]
Merge commit '
406627287e015ce381795e85e2557b12bf60ca35 '
* commit '
406627287e015ce381795e85e2557b12bf60ca35 ':
asfdec: do not read replicated data when their length is 0
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Anton Khirnov [Tue, 14 Jul 2015 16:16:26 +0000 (18:16 +0200)]
qsvenc: properly handle asynchronous encoding
Wait for async_depth frames before syncing.
Anton Khirnov [Tue, 14 Jul 2015 16:16:26 +0000 (18:16 +0200)]
qsvdec: properly handle asynchronous decoding
Wait for async_depth frames before syncing.
Anton Khirnov [Thu, 16 Jul 2015 17:26:36 +0000 (19:26 +0200)]
af_resample: do not touch the timestamps if we are not resampling
This filter currently assumes that the input audio is continuous and
does some timestamps manipulation based on this assumption.
This is unnecessary if we are only converting the channel layout or the
sample format, without resampling. In such a case, just leave the
timestamps as they are.
Anton Khirnov [Wed, 15 Jul 2015 17:49:24 +0000 (19:49 +0200)]
avconv: split creating and (re-)configuring complex filtergraphs
The current code is less than straightforward due to the fact that
output streams can be created based on filtergraph definitions. This
change should make the code simpler and more readable. It will also be
useful in the future commits.
Anton Khirnov [Wed, 15 Jul 2015 15:17:54 +0000 (17:17 +0200)]
avconv: create the complex filtergraphs earlier
Since global options are processed before all the other options now, we
do not have to try creating the complex filtergraphs several times
anymore, it is enough to do it once after the input files are opened.
Anton Khirnov [Wed, 15 Jul 2015 13:51:39 +0000 (15:51 +0200)]
avconv: move the no streams failure to open_output_file()
It is a better place for it, there is no reason to wait until
transcode_init().
Anton Khirnov [Sun, 28 Jun 2015 08:49:19 +0000 (10:49 +0200)]
avconv: factor out the output stream initialization
Anton Khirnov [Sun, 28 Jun 2015 06:45:02 +0000 (08:45 +0200)]
avconv: use read_file() for reading the 2pass stats
Also, drop the now unused cmdutils_read_file(). There is no reason to
have two functions doing essentially the same thing.
Anton Khirnov [Sun, 28 Jun 2015 06:37:58 +0000 (08:37 +0200)]
avconv: move handling the 2pass logfile into avconv_opt
It more logically belongs there.
Anton Khirnov [Sun, 28 Jun 2015 06:03:44 +0000 (08:03 +0200)]
avconv: set the encoding/decoding_needed flags earlier
This will be useful in the following commits.
Anton Khirnov [Sun, 28 Jun 2015 05:41:22 +0000 (07:41 +0200)]
avconv: drop update_sample_fmt()
There is only one decoder left that supports this (libopus, which is not
used by default since we have a native one) and this code goes against
the avconv design, since it propagates information back from the encoder
to decoder.
Alexandra Hájková [Fri, 17 Jul 2015 12:17:07 +0000 (14:17 +0200)]
asfdec: make nb_sub to be unsigned int
number of subpayloads should be always positive
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Alexandra Hájková [Fri, 17 Jul 2015 12:17:06 +0000 (14:17 +0200)]
asfdec: read the replicated data in a separate function
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Alexandra Hájková [Fri, 17 Jul 2015 12:17:05 +0000 (14:17 +0200)]
asfdec: convert condition for the replicated data reading to be safer
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Alexandra Hájková [Fri, 17 Jul 2015 12:17:03 +0000 (14:17 +0200)]
asfdec: do not read replicated data when their length is 0
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Sun, 19 Jul 2015 00:50:06 +0000 (02:50 +0200)]
avcodec/hevc_parser: Treat extradata parsing differently, as it should not contain an AU
Fixes ticket4718
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Sat, 18 Jul 2015 21:29:44 +0000 (18:29 -0300)]
avutil/x86/bswap: force inline asm versions with ICC
Recent ICC versions that define GCC as >= 4.5 (like ICC 13) apparently can't
optimize the generic C versions of av_bswap*() on their own.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 18 Jul 2015 19:52:42 +0000 (16:52 -0300)]
avutil/intmath: check for ICC before GCC
Intel compiler also defines __GNUC__, so the Intel specific intrinsics were not
really being used.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Paul B Mahol [Sat, 18 Jul 2015 05:00:03 +0000 (05:00 +0000)]
avfilter/vf_blend: unbreak tblend
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 18 Jul 2015 02:30:59 +0000 (02:30 +0000)]
fate: add tblend filter test
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 18 Jul 2015 21:25:07 +0000 (23:25 +0200)]
avformat/mpegtsenc: Add sdt_period, similar to pat_period
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 16 Jul 2015 10:56:55 +0000 (12:56 +0200)]
avformat/mpegtsenc: Support a user specified PAT/PMT period
Can be used to fix Ticket3714
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 15 Jul 2015 23:54:56 +0000 (01:54 +0200)]
avformat/mpegtsenc: support storing PAT/PMT per frame
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Ganesh Ajjanagadde [Sat, 18 Jul 2015 12:34:02 +0000 (08:34 -0400)]
doc/developer: add url for sample files
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Wed, 15 Jul 2015 18:04:28 +0000 (18:04 +0000)]
avfilter/vf_blend: implement 16bit support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 17 Jul 2015 12:52:22 +0000 (12:52 +0000)]
fate: add test for mergeplanes filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 18 Jul 2015 17:18:24 +0000 (19:18 +0200)]
avcodec/vp8: Check buffer size in vp8_decode_frame_header()
avoids null pointer dereference
Fixes: signal_sigsegv_d5de40_964_vp80-00-comprehensive-010.ivf with memlimit of 1048576
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 18 Jul 2015 17:02:26 +0000 (19:02 +0200)]
avcodec/vp8: Fix null pointer dereference in ff_vp8_decode_free()
Fixes: signal_sigsegv_d5de23_967_vp80_00_comprehensive_010.ivf with memlimit 524288
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 18 Jul 2015 15:55:19 +0000 (17:55 +0200)]
avcodec/diracdec: Check for hpel_base allocation failure
Fixes null pointer dereference
Fixes: signal_sigsegv_b02a96_280_RL_420p_ffdirac.drc with memlimit of 67108864
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 18 Jul 2015 11:17:21 +0000 (13:17 +0200)]
avformat/movenc: Drop redundant bit exact field from context
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 18 Jul 2015 09:24:45 +0000 (11:24 +0200)]
avcodec/rv34: Clear pointers in ff_rv34_decode_init_thread_copy()
Avoids leaving stale pointers
Fixes: signal_sigabrt_7ffff70eccc9_819_sabtriple.rm with memlimit 536870912
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 18 Jul 2015 08:45:57 +0000 (10:45 +0200)]
avutil/frame: Update AVFrame docs library references
These where apparently forgotten when AVFrames where moved into libavutil
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 18 Jul 2015 08:45:12 +0000 (10:45 +0200)]
avfilter/af_dynaudnorm: Use av_frame_get_channels()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 18 Jul 2015 03:12:00 +0000 (05:12 +0200)]
avcodec/hevc_ps: Also print depth in failure path of map_pixel_format()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Ganesh Ajjanagadde [Sat, 18 Jul 2015 02:09:48 +0000 (22:09 -0400)]
avformat: increase first_frames threshold for mp3,ac3
Fixes Ticket4723
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 18 Jul 2015 00:38:54 +0000 (02:38 +0200)]
Merge commit '
c9f8cfb6d9b34f3c51f1b7152c4dc3f2f8724dc4 '
* commit '
c9f8cfb6d9b34f3c51f1b7152c4dc3f2f8724dc4 ':
fate: add checkasm target
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 18 Jul 2015 00:31:07 +0000 (02:31 +0200)]
Merge commit '
82e6ac85ff9aa7631b8c01521b3d6b5ca0bc8014 '
* commit '
82e6ac85ff9aa7631b8c01521b3d6b5ca0bc8014 ':
checkasm: test all architectures with optimisations
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 18 Jul 2015 00:22:55 +0000 (02:22 +0200)]
Merge commit '
cb33f8d0f48b1e9d642ca1cbea142dcbedd08a27 '
* commit '
cb33f8d0f48b1e9d642ca1cbea142dcbedd08a27 ':
checkasm: Give macro a body to avoid potential unexpected syntax issues
See:
a39512ba9e0c0f0e96d872af1c087f07322818fa
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 18 Jul 2015 00:22:39 +0000 (02:22 +0200)]
Merge commit '
6cc4d3e9a982e926494f4b919d9733fe29774acf '
* commit '
6cc4d3e9a982e926494f4b919d9733fe29774acf ':
checkasm: exit with status 0 instead of 1 if there are no tests to perform
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 18 Jul 2015 00:12:27 +0000 (02:12 +0200)]
Merge commit '
256ef19844892c6cf8e0386e3287bae970ec6320 '
* commit '
256ef19844892c6cf8e0386e3287bae970ec6320 ':
h264: arm: use intra pred8x8 functions only for chroma_format_idc <= 1
Conflicts:
libavcodec/arm/h264pred_init_arm.c
See:
565cabf5c80b25d86c2e539afcb3b24024fbce0a
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 17 Jul 2015 23:56:58 +0000 (01:56 +0200)]
Merge commit '
fc56868399213d3e9be19bdebeb64df233b39a7e '
* commit '
fc56868399213d3e9be19bdebeb64df233b39a7e ':
cosmetics: Reformat checkasm tests
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Zhang Rui [Thu, 16 Jul 2015 07:04:42 +0000 (15:04 +0800)]
avformat/async: support filling with a background thread.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Janne Grunau [Sun, 12 Jul 2015 15:35:21 +0000 (17:35 +0200)]
fate: add checkasm target
Janne Grunau [Sun, 12 Jul 2015 14:41:42 +0000 (16:41 +0200)]
checkasm: test all architectures with optimisations
Michael Niedermayer [Fri, 17 Jul 2015 16:07:58 +0000 (18:07 +0200)]
checkasm: Give macro a body to avoid potential unexpected syntax issues
Henrik Gramner [Fri, 17 Jul 2015 16:07:57 +0000 (18:07 +0200)]
checkasm: exit with status 0 instead of 1 if there are no tests to perform
Janne Grunau [Sun, 12 Jul 2015 15:03:13 +0000 (17:03 +0200)]
h264: arm: use intra pred8x8 functions only for chroma_format_idc <= 1
Michael Niedermayer [Fri, 17 Jul 2015 21:26:42 +0000 (23:26 +0200)]
Merge commit '
d37f23263584774e1798e9ac909a398304a05091 '
* commit '
d37f23263584774e1798e9ac909a398304a05091 ':
checkasm: Add unit tests for bswapdsp
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 17 Jul 2015 21:20:14 +0000 (23:20 +0200)]
Merge commit '
a344e5d094ebcf9a23acf3a27c56cbbbc829db42 '
* commit '
a344e5d094ebcf9a23acf3a27c56cbbbc829db42 ':
x86: bswapdsp: Don't treat 32-bit integers as 64-bit
Conflicts:
libavcodec/x86/bswapdsp.asm
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 17 Jul 2015 21:04:47 +0000 (23:04 +0200)]
Merge commit '
f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09 '
* commit '
f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09 ':
configure: Factor out g722dsp module
Conflicts:
configure
libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 17 Jul 2015 20:56:00 +0000 (22:56 +0200)]
Merge commit '
a623aa0069dff586241ad2ffedcd45ed840e2553 '
* commit '
a623aa0069dff586241ad2ffedcd45ed840e2553 ':
configure: Factor out wmv2dsp module
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 17 Jul 2015 20:45:34 +0000 (22:45 +0200)]
Merge commit '
d42191c78befc1983f23b1899b2dda513b72f1ed '
* commit '
d42191c78befc1983f23b1899b2dda513b72f1ed ':
configure: Factor out vp8dsp module
Conflicts:
configure
libavcodec/Makefile
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 17 Jul 2015 20:31:41 +0000 (22:31 +0200)]
Merge commit '
d4aea1aa4060fb5ba7f5f426823b697d2a5af08b '
* commit '
d4aea1aa4060fb5ba7f5f426823b697d2a5af08b ':
configure: Factor out vp56dsp module
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 17 Jul 2015 20:21:36 +0000 (22:21 +0200)]
Merge commit '
5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418 '
* commit '
5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418 ':
configure: Factor out rv34dsp module
Conflicts:
libavcodec/Makefile
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 17 Jul 2015 20:10:58 +0000 (22:10 +0200)]
avcodec/libx264: fix MPEG2 support
Found-by: rcombs
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 17 Jul 2015 19:59:45 +0000 (21:59 +0200)]
Merge commit '
575ec60e542114b2ef5b2f88b28eeb72389dda45 '
* commit '
575ec60e542114b2ef5b2f88b28eeb72389dda45 ':
configure: Factor out mss34dsp module
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 17 Jul 2015 19:51:13 +0000 (21:51 +0200)]
Merge commit '
2edc77dc7be5f4a006c6295f4c827e5471f85262 '
* commit '
2edc77dc7be5f4a006c6295f4c827e5471f85262 ':
configure: Factor out ividsp module
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 17 Jul 2015 19:42:14 +0000 (21:42 +0200)]
Merge commit '
b075869bc1e1aadea0a8dc819ebfb758adb9e3d0 '
* commit '
b075869bc1e1aadea0a8dc819ebfb758adb9e3d0 ':
configure: Factor out flacdsp module
Conflicts:
configure
libavcodec/Makefile
libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 17 Jul 2015 19:32:12 +0000 (21:32 +0200)]
Merge commit '
4da585ae478f8b6f865ab13779af399aee20d899 '
* commit '
4da585ae478f8b6f865ab13779af399aee20d899 ':
OS/2: Cleanup slib_create_def_cmd
See:
22a0387df29c7450f57d09fbb24b7bc5f3b1fb89
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Luca Barbato [Fri, 17 Jul 2015 18:07:26 +0000 (20:07 +0200)]
cosmetics: Reformat checkasm tests