]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sun, 5 May 2013 09:50:29 +0000 (11:50 +0200)]
Merge commit '
e445647b4fdf481b13b2743b303d84de4f43bedd '
* commit '
e445647b4fdf481b13b2743b303d84de4f43bedd ':
avresample: Add av_cold attributes to init functions missing them
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 5 May 2013 09:42:18 +0000 (11:42 +0200)]
Merge commit '
093804a93cc5da3f95f98265a5df116912443cec '
* commit '
093804a93cc5da3f95f98265a5df116912443cec ':
avfilter: Add av_cold attributes to init/uninit functions
Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/af_volume.c
libavfilter/src_movie.c
libavfilter/vf_lut.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 5 May 2013 09:34:29 +0000 (11:34 +0200)]
Merge commit '
6fee1b90ce3bf4fbdfde7016e0890057c9000487 '
* commit '
6fee1b90ce3bf4fbdfde7016e0890057c9000487 ':
avcodec: Add av_cold attributes to init functions missing them
Conflicts:
libavcodec/aacpsy.c
libavcodec/atrac3.c
libavcodec/dvdsubdec.c
libavcodec/ffv1.c
libavcodec/ffv1enc.c
libavcodec/h261enc.c
libavcodec/h264_parser.c
libavcodec/h264dsp.c
libavcodec/h264pred.c
libavcodec/libschroedingerenc.c
libavcodec/libxvid_rc.c
libavcodec/mpeg12.c
libavcodec/mpeg12enc.c
libavcodec/proresdsp.c
libavcodec/rangecoder.c
libavcodec/videodsp.c
libavcodec/x86/proresdsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 5 May 2013 09:19:12 +0000 (11:19 +0200)]
Merge commit '
72e228b274a98af1aba9588415d0cd87fde44663 '
* commit '
72e228b274a98af1aba9588415d0cd87fde44663 ':
nut: K&R formatting cosmetics
Conflicts:
libavformat/nut.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 5 May 2013 08:48:33 +0000 (10:48 +0200)]
configure: fix valgrind-memcheck arguments
They now match the --valgrind arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 5 May 2013 08:47:19 +0000 (10:47 +0200)]
Merge commit '
b1ee8eec849f17fce2f411a297de9cbf2edaeb3a '
* commit '
b1ee8eec849f17fce2f411a297de9cbf2edaeb3a ':
configure: Add basic valgrind-memcheck support
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 5 May 2013 08:36:23 +0000 (10:36 +0200)]
Merge commit '
95e8ac60f8b7317ce23c648250fdc8fb68d65a07 '
* commit '
95e8ac60f8b7317ce23c648250fdc8fb68d65a07 ':
build: normalize coverage.info
Conflicts:
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 5 May 2013 08:18:41 +0000 (10:18 +0200)]
Merge commit '
768e44d044bc32de1e58c198a3708d186af7e966 '
* commit '
768e44d044bc32de1e58c198a3708d186af7e966 ':
build: tune down the output of lcov/gcov
Conflicts:
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Thu, 2 May 2013 21:56:19 +0000 (23:56 +0200)]
Detect and skip mj2-style jp2c header.
This this fixes one of the issues with
http://blogs.bu.edu/mhirsch/files/2012/08/Rotate180CCW-checkerboard.mj2_.zip
and at least allows to demux the file properly instead
of failing during probing.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Thu, 2 May 2013 21:52:44 +0000 (23:52 +0200)]
Avoid incorrect deprecated pixel format warning.
Should only be printed if a "JPEG" format was used,
not for e.g. XYZ.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Claudio Freire [Sat, 4 May 2013 21:36:37 +0000 (18:36 -0300)]
AAC encoder: Fix rate control on twoloop.
Fixes a case where multichannel bitrate isn't accurately
targetted by psy model alone, never achieving the target bitrate.
Now fixed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Claudio Freire [Sat, 4 May 2013 21:35:49 +0000 (18:35 -0300)]
AAC encoder: Fixed a rounding bug in psy's channel bitrate computation.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 May 2013 22:56:39 +0000 (00:56 +0200)]
src_movie: fix scanf string
Fixes out of array accesses
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 May 2013 22:23:13 +0000 (00:23 +0200)]
xbmdec: fix off by one error in scanf()
Fixes out of array access
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 30 Apr 2013 16:30:48 +0000 (18:30 +0200)]
avresample: Add av_cold attributes to init functions missing them
Diego Biurrun [Tue, 30 Apr 2013 16:30:02 +0000 (18:30 +0200)]
avfilter: Add av_cold attributes to init/uninit functions
Diego Biurrun [Fri, 1 Feb 2013 09:31:59 +0000 (10:31 +0100)]
avcodec: Add av_cold attributes to init functions missing them
Michael Niedermayer [Sat, 4 May 2013 18:21:47 +0000 (20:21 +0200)]
h264: Always decode MMCOs into temprary array
When decoding succeeded the array is copied into the permanent one.
This prevents inconsistencies
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sat, 4 May 2013 09:10:14 +0000 (11:10 +0200)]
nut: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Sat, 4 May 2013 14:58:41 +0000 (16:58 +0200)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavf/matroskaenc: return an error for unsupported types.
lavf/concatdec: remove invalid check for AVSEEK_FLAG_BACKWARD.
lavf: filter out AVSEEK_FLAG_BACKWARD in new API.
lavf: call the new seek API from the old.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 May 2013 14:49:47 +0000 (16:49 +0200)]
wmaprodec: Fix null pointer dereference in decode_frame()
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 May 2013 12:37:22 +0000 (14:37 +0200)]
dfa: Put our pointer check back.
The reimplementation by Libav does not prevent out of array
writes, even though it looks like it does at a quick glance.
No FFmpeg releases are affected by this
See:
d1c95d2ce39560e251fdb14f4af91b04fd7b845c
3623589edc7b1257bb45aa9e52c9631e133f22b6
740ebe468c0567cac03ef7e6b4b9fd0253b97da2
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Mon, 29 Apr 2013 18:45:22 +0000 (20:45 +0200)]
lavf/matroskaenc: return an error for unsupported types.
Nicolas George [Fri, 3 May 2013 08:32:45 +0000 (10:32 +0200)]
lavf/concatdec: remove invalid check for AVSEEK_FLAG_BACKWARD.
Nicolas George [Fri, 3 May 2013 08:31:33 +0000 (10:31 +0200)]
lavf: filter out AVSEEK_FLAG_BACKWARD in new API.
Also document that it has no effect.
Nicolas George [Mon, 29 Apr 2013 21:58:22 +0000 (23:58 +0200)]
lavf: call the new seek API from the old.
If the demuxer implements read_seek2() and not read_seek(),
call avformat_seek_file() from av_seek_frame().
Allow to properly seek in formats that only implement the
new API from applications that use the old one.
Tested with mplayer and a concat script.
Hendrik Leppkes [Sat, 4 May 2013 09:17:00 +0000 (11:17 +0200)]
aacdec: free frame buffer if no audio was decoded
If no decoding error was detected, but still no audio was decoded, the
frame needs to be free'ed, or it will leak.
Fixes part of ticket #2095
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reinhard Tartler [Sat, 4 May 2013 08:25:41 +0000 (10:25 +0200)]
configure: Add basic valgrind-memcheck support
With the parameter --valgrind-memcheck, the configure script sets
reasonable defaults that can be overridden as explained in the
documentation.
The idea of using set_defaults is from Luca Barbato.
Michael Niedermayer [Sat, 4 May 2013 08:33:50 +0000 (10:33 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wav: return meaningful errors
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 May 2013 08:17:52 +0000 (10:17 +0200)]
Merge commit '
a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7 '
* commit '
a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7 ':
silly typo fixes
Conflicts:
doc/protocols.texi
libavcodec/aacpsy.c
libavformat/utils.c
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 May 2013 08:06:10 +0000 (10:06 +0200)]
Merge commit '
4a7af92cc80ced8498626401ed21f25ffe6740c8 '
* commit '
4a7af92cc80ced8498626401ed21f25ffe6740c8 ':
sbrdsp: Unroll and use integer operations
sbrdsp: Unroll sbr_autocorrelate_c
x86: sbrdsp: Implement SSE2 qmf_deint_bfly
Conflicts:
libavcodec/sbrdsp.c
libavcodec/x86/sbrdsp.asm
libavcodec/x86/sbrdsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Reinhard Tartler [Sun, 21 Apr 2013 17:10:26 +0000 (19:10 +0200)]
build: normalize coverage.info
Without this, lcov sometimes misses to normalize paths that contain "/./".
Also, ignore uninteresting hits in system headers.
Reinhard Tartler [Sun, 21 Apr 2013 17:08:59 +0000 (19:08 +0200)]
build: tune down the output of lcov/gcov
In the default settings, both tools produce a lot of unhelpful noise.
Michael Niedermayer [Sat, 4 May 2013 00:47:58 +0000 (02:47 +0200)]
evrcdec: fix sign error
The specification wants round(abs(x))) * sign(x) which is
equivakent to round(x)
Fixes out of array access
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 23:11:08 +0000 (01:11 +0200)]
snow: Fix off by 1 error in reference picture management
Fixes out of array accesses
No release is affected by this bug
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 21:16:54 +0000 (23:16 +0200)]
eamad: Check against minimum supported dimensions
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 2 May 2013 22:14:59 +0000 (22:14 +0000)]
doc/filters: document asetpts in single place
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Luca Barbato [Thu, 2 May 2013 20:40:25 +0000 (22:40 +0200)]
wav: return meaningful errors
Paul B Mahol [Sat, 23 Feb 2013 19:29:31 +0000 (19:29 +0000)]
lavu: add planar 16 bit and 8 bit rgb with alpha
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Stefano Sabatini [Wed, 24 Apr 2013 09:14:27 +0000 (11:14 +0200)]
lavfi/testsrc: add support for color interactive command
Paul B Mahol [Tue, 30 Apr 2013 12:12:12 +0000 (12:12 +0000)]
extractplanes filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diego Biurrun [Mon, 20 Aug 2012 23:02:13 +0000 (01:02 +0200)]
silly typo fixes
Christophe Gisquet [Tue, 9 Apr 2013 21:57:10 +0000 (21:57 +0000)]
sbrdsp: Unroll and use integer operations
This patch can be controversial, by assuming floats are IEEE-754 and
particular behaviour of the FPU will get in the way.
Timing on Arrandale and Win32 (thus, x87 FPU is used in the reference).
sbr_qmf_pre_shuffle_c: 115 to 76
sbr_neg_odd_64_c: 84 to 55
sbr_qmf_post_shuffle_c: 112 to 83
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Christophe Gisquet [Tue, 9 Apr 2013 21:57:09 +0000 (21:57 +0000)]
sbrdsp: Unroll sbr_autocorrelate_c
1410 cycles to 1148 on Arrandale/Win64
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Christophe Gisquet [Tue, 9 Apr 2013 21:57:07 +0000 (21:57 +0000)]
x86: sbrdsp: Implement SSE2 qmf_deint_bfly
Sandybridge: 47 cycles
Having a loop counter is a 7 cycle gain.
Unrolling is another 7 cycle gain.
Working in reverse scan is another 6 cycles.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Fri, 3 May 2013 16:09:15 +0000 (18:09 +0200)]
vc1dec: fix lutuv use in vc1_mc_4mv_chroma4()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 15:44:30 +0000 (17:44 +0200)]
vc1dec: Fix mixed field/frame intensity compensation
Fixes Ticket2523
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 24 Apr 2013 18:42:07 +0000 (20:42 +0200)]
vc1dec: vc1_mc_4mv_chroma4: match addressing between compensation and MC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Fri, 3 May 2013 15:03:12 +0000 (17:03 +0200)]
lavfi/frei0r: fix crash when parameters are not set.
Michael Niedermayer [Fri, 3 May 2013 13:38:46 +0000 (15:38 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
compat: msvc: Make sure the object files are included when linking statically
id3v2: check for end of file while unescaping tags
Conflicts:
configure
libavformat/id3v2.c
Note, ffmpeg is not affected by the out of buffer write bug
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 13:04:47 +0000 (15:04 +0200)]
ffmpeg: drop old non monotone dts workaround.
All bugs should now be fixed in the new so the old can be droped.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 13:03:35 +0000 (15:03 +0200)]
ffmpeg: set correct log context for non monotone dts workaround warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 13:02:43 +0000 (15:02 +0200)]
ffmpeg: port loglevel selection code to new dts workaround code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 13:00:21 +0000 (15:00 +0200)]
ffmpeg: fix pts handling in the non monotone dts workaround
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 12:58:28 +0000 (14:58 +0200)]
ffmpeg: fix the used maximum dts in the monotone dts workaround
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 12:57:05 +0000 (14:57 +0200)]
ffmpeg: use a max variable to hold the maximum dts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 12:54:13 +0000 (14:54 +0200)]
ffmpeg: Check dts before use in non monotone dts workaround
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 12:53:18 +0000 (14:53 +0200)]
ffmpeg: limit non monotone workaround to audio & video streams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 12:52:37 +0000 (14:52 +0200)]
ffmpeg: move non monotone prevention code down
This moves the code to after the bitstream filters
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 12:17:54 +0000 (14:17 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: do not send non-monotonous DTS to the muxers.
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 11:53:08 +0000 (13:53 +0200)]
Merge commit '
b4a5a292274f904f404f40f826c51e6fc9cfb8fe '
* commit '
b4a5a292274f904f404f40f826c51e6fc9cfb8fe ':
avconv: improve -re implementation
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 11:16:34 +0000 (13:16 +0200)]
Merge commit '
e3b225a4fe0ff1e64a220b757c6f0a5cf9258521 '
* commit '
e3b225a4fe0ff1e64a220b757c6f0a5cf9258521 ':
matroskaenc: add an option to put the index at the start of the file
Conflicts:
doc/muxers.texi
libavformat/matroskaenc.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 11:09:23 +0000 (13:09 +0200)]
Merge commit '
0574bc06d23a6690a16c5926dddc9be359a3d7bb '
* commit '
0574bc06d23a6690a16c5926dddc9be359a3d7bb ':
matroskaenc: cosmetics, reorder the #includes
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 10:58:52 +0000 (12:58 +0200)]
Merge commit '
accde1bd8756936e1757b42fc9bad2eb5d192f8a '
* commit '
accde1bd8756936e1757b42fc9bad2eb5d192f8a ':
vc1_parser: Set field_order.
mpegvideo_parser: Set field_order.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 2 May 2013 08:01:43 +0000 (11:01 +0300)]
compat: msvc: Make sure the object files are included when linking statically
If building libav with -MD in the cflags (for making the MSVC compiler
generate code for using a dynamically linked libc), the system headers
that declare strtod, snprintf and vsnprintf declare the functions as
imported from a DLL. To hook up wrappers of our own for these functions,
the function names are defined to avpriv_*, so that the calling code
within libav calls the wrappers instead. Since these functions
are declared to be imported from DLLs, the calling code expects to
load them from DLL import function pointers (creating references to
_imp__avpriv_strtod instead of directly to avpriv_strtod). If the
libav libraries are not built as DLLs, no such function pointers (as
the calling code expects) are created.
The linker can fix this up automatically in some cases (producing
warnings LNK4217 and LNK4049), if the object files are already
included. By telling the linker to try to include those symbols
(without the _imp prefix as the calling code ends up using),
we get the object files included, so that the linker can do the
automatic fixup. This is done via config.h, so that all (or at least
most) of the object files in our libraries force including the compat
files, to make sure they are included regardless of what files from our
static libraries actually are included.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Fri, 3 May 2013 10:15:01 +0000 (12:15 +0200)]
Merge commit '
507b1e454cf9953da3e18f33c9bd1fca78c97cb5 '
* commit '
507b1e454cf9953da3e18f33c9bd1fca78c97cb5 ':
avcodec: Add field order information to AVCodecParserContext.
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 09:57:59 +0000 (11:57 +0200)]
Merge commit '
566b7a20fd0cab44d344329538d314454a0bcc2f '
* commit '
566b7a20fd0cab44d344329538d314454a0bcc2f ':
x86: float dsp: butterflies_float SSE
Conflicts:
libavutil/x86/float_dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 09:41:48 +0000 (11:41 +0200)]
Merge commit '
b333f3a22a4db4cf65d6a0457ac82ecbe7c7ac44 '
* commit '
b333f3a22a4db4cf65d6a0457ac82ecbe7c7ac44 ':
lavf-regression: use -frames instead of -t for image tests
Conflicts:
tests/lavf-regression.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 09:32:04 +0000 (11:32 +0200)]
avcodec: move lowres down with the next ABI bump and add accessors
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 09:30:00 +0000 (11:30 +0200)]
Merge commit '
803d21f38bdafe7c4e2571a9ae7052013a12923b '
* commit '
803d21f38bdafe7c4e2571a9ae7052013a12923b ':
lavc: schedule AVCodecContext.lowres for removal on next bump.
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 09:16:54 +0000 (11:16 +0200)]
Merge commit '
ffb068ce8e99df121d18a5b9b1d820f3ea8697fb '
* commit '
ffb068ce8e99df121d18a5b9b1d820f3ea8697fb ':
configure: Don't do enable_deep_weak on disabled variables
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 09:11:36 +0000 (11:11 +0200)]
Merge commit '
4d810ad2e943a59658ddf00a397121c2b62f7157 '
* commit '
4d810ad2e943a59658ddf00a397121c2b62f7157 ':
configure: Use a different variable name in push/popvar
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 09:06:27 +0000 (11:06 +0200)]
Merge commit '
13f57a4d881ec669b87bf82f424bfff502433060 '
* commit '
13f57a4d881ec669b87bf82f424bfff502433060 ':
wav: K&R formatting cosmetics
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 08:55:43 +0000 (10:55 +0200)]
Merge commit '
6b753015ca6f93d16a05e1a97da1fa42e4da60ec '
* commit '
6b753015ca6f93d16a05e1a97da1fa42e4da60ec ':
aac: Remove aacpsy.h header, unused since
78e65cd7726
cavs: Remove cavsdata.h header, unused since
88386feefd
Conflicts:
libavcodec/aacpsy.h
libavcodec/cavsdata.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 08:49:46 +0000 (10:49 +0200)]
Merge commit '
bf7c3c6b157f7938578f964b62cffd5e504940be '
* commit '
bf7c3c6b157f7938578f964b62cffd5e504940be ':
x86: dsputil: Move cavs and vc1-specific functions where they belong
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 08:43:52 +0000 (10:43 +0200)]
Merge commit '
932806232108872655556100011fe369125805d3 '
* commit '
932806232108872655556100011fe369125805d3 ':
x86: dsputil: Move avg_pixels16_mmx() out of rnd_template.c
x86: dsputil: Move avg_pixels8_mmx() out of rnd_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 08:30:37 +0000 (10:30 +0200)]
Merge commit '
9b3a04d30691e85b77e63f75f5f26a93c3a000cd '
* commit '
9b3a04d30691e85b77e63f75f5f26a93c3a000cd ':
x86: Move duplicated put_pixels{8|16}_mmx functions into their own file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Wed, 1 May 2013 17:01:11 +0000 (19:01 +0200)]
id3v2: check for end of file while unescaping tags
Prevent a serious out of buffer bound write.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Anton Khirnov [Wed, 24 Apr 2013 06:34:44 +0000 (08:34 +0200)]
avconv: do not send non-monotonous DTS to the muxers.
Hack partially based on a commit by Michael Niedermayer <michaelni@gmx.at>
Should fix (or work around) bug 458.
Anton Khirnov [Tue, 23 Apr 2013 18:34:59 +0000 (20:34 +0200)]
avconv: improve -re implementation
Integrate the code in the packet reading function, instead of inserting
sleeps in many places.
This is simpler to follow and should work better.
Anton Khirnov [Tue, 30 Apr 2013 06:36:20 +0000 (08:36 +0200)]
matroskaenc: add an option to put the index at the start of the file
Anton Khirnov [Tue, 30 Apr 2013 05:52:50 +0000 (07:52 +0200)]
matroskaenc: cosmetics, reorder the #includes
Masaki Tanaka [Tue, 9 Apr 2013 07:44:40 +0000 (16:44 +0900)]
vc1_parser: Set field_order.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Masaki Tanaka [Tue, 9 Apr 2013 07:43:08 +0000 (16:43 +0900)]
mpegvideo_parser: Set field_order.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Masaki Tanaka [Tue, 9 Apr 2013 07:39:34 +0000 (16:39 +0900)]
avcodec: Add field order information to AVCodecParserContext.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Christophe Gisquet [Fri, 12 Apr 2013 19:07:01 +0000 (21:07 +0200)]
x86: float dsp: butterflies_float SSE
97c -> 49c
Some codecs could benefit from more unrolling, but AAC doesn't.
Anton Khirnov [Thu, 2 May 2013 07:39:18 +0000 (09:39 +0200)]
lavf-regression: use -frames instead of -t for image tests
-t 0.5 is 12.5 frames at 25 fps, which may round to either 12 or 13 on
different platforms.
Anton Khirnov [Tue, 30 Apr 2013 10:17:33 +0000 (12:17 +0200)]
lavc: schedule AVCodecContext.lowres for removal on next bump.
It has been deprecated some time ago, but was forgotten during the last
bump.
highgod0401 [Fri, 3 May 2013 01:24:43 +0000 (09:24 +0800)]
lavu/opencl: fix the compile bug on linux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 2 May 2013 22:26:35 +0000 (00:26 +0200)]
fate: Adjust filter-trim-time parameters
This should workaround rounding differences between platforms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 2 May 2013 20:06:03 +0000 (22:06 +0200)]
mmvideo/mm_decode_intra: check horizontal coordinate too
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 2 May 2013 19:52:08 +0000 (21:52 +0200)]
mmvideo/mm_decode_inter: check horizontal coordinate too
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 3 Apr 2013 12:55:14 +0000 (15:55 +0300)]
configure: Don't do enable_deep_weak on disabled variables
This avoids cases where configure tries to weakly enable an item
which actually is disabled, ending up still enabling dependencies
of the item which itself is only enabled weakly.
More concretely, the h264 decoder suggests error resilience, which
is then enabled weakly (unless manually disabled). Previously,
dsputil, which is a dependency of error resilience, was enabled
even if error resilience wasn't enabled in the end.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 3 Apr 2013 12:52:45 +0000 (15:52 +0300)]
configure: Use a different variable name in push/popvar
The variable name 'var' is commonly used to iterate through arguments
in other functions. When the pushvar function internally uses the
variable 'var', it makes pushing/popping the variable 'var' not
work as intended.
Signed-off-by: Martin Storsjö <martin@martin.st>
Luca Barbato [Thu, 2 May 2013 09:42:09 +0000 (11:42 +0200)]
wav: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Thu, 2 May 2013 16:44:22 +0000 (18:44 +0200)]
nutdec: Implement duration parsing for indexed nuts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 2 May 2013 14:55:59 +0000 (16:55 +0200)]
aac: Remove aacpsy.h header, unused since
78e65cd7726
Diego Biurrun [Thu, 2 May 2013 14:46:51 +0000 (16:46 +0200)]
cavs: Remove cavsdata.h header, unused since
88386feefd
Michael Niedermayer [Thu, 2 May 2013 15:24:02 +0000 (17:24 +0200)]
ape_decode_value_3860: check k before using it in get_bits()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 2 May 2013 14:45:06 +0000 (16:45 +0200)]
ape_decode_value_3900: check tmpk
Fixes division by 0
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>