OSDN Git Service
Michael Niedermayer [Sun, 15 May 2011 02:40:50 +0000 (04:40 +0200)]
Merge remote branch 'qatar/master'
* qatar/master:
Fix FSF address copy paste error in some license headers.
Add an aac sample which uses LTP to fate-aac.
DUPLICATE [PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats.
arm: properly mark external symbol call
Conflicts:
libavcodec/x86/ac3dsp.asm
libavcodec/x86/deinterlace.asm
libavcodec/x86/dsputil_yasm.asm
libavcodec/x86/dsputilenc_yasm.asm
libavcodec/x86/fft_mmx.asm
libavcodec/x86/fmtconvert.asm
libavcodec/x86/h264_chromamc.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_idct.asm
libavcodec/x86/h264_intrapred.asm
libavcodec/x86/h264_weight.asm
libavcodec/x86/vc1dsp_yasm.asm
libavcodec/x86/vp3dsp.asm
libavcodec/x86/vp56dsp.asm
libavcodec/x86/vp8dsp.asm
libavcodec/x86/x86util.asm
libswscale/ppc/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 15 May 2011 01:25:27 +0000 (03:25 +0200)]
Initial caf muxer.
Carl Eugen Hoyos [Sun, 15 May 2011 00:42:58 +0000 (02:42 +0200)]
Support decoding of amr_nb and gsm in caf.
Carl Eugen Hoyos [Sun, 15 May 2011 00:38:02 +0000 (02:38 +0200)]
Fix decoding of msrle samples with 1bpp.
Michael Niedermayer [Sat, 14 May 2011 23:48:17 +0000 (01:48 +0200)]
udp: remove resource.h inclusion, it breaks mingw compilation.
The header seems unneeded, if its needed we will put it back with appropriate #if
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 May 2011 23:39:04 +0000 (01:39 +0200)]
ffmpeg: Allow seting and cycling through debug modes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sat, 14 May 2011 19:32:31 +0000 (21:32 +0200)]
Fix FSF address copy paste error in some license headers.
Justin Ruggles [Tue, 26 Apr 2011 22:19:52 +0000 (18:19 -0400)]
Add an aac sample which uses LTP to fate-aac.
Michael Niedermayer [Sat, 14 May 2011 13:51:47 +0000 (15:51 +0200)]
ffmpeg: Help for interactive keys.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 May 2011 11:34:08 +0000 (13:34 +0200)]
UDP: dont use thread_t as truth value.
Unbreak compile on mingw.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Belkner [Sat, 14 May 2011 11:22:46 +0000 (13:22 +0200)]
swscale: fix compile on mingw32
Compiling "swscale.c" breaks on MINGW32 because of multiple including
"libswscale_template.c"
Ronald S. Bultje [Fri, 13 May 2011 23:01:50 +0000 (19:01 -0400)]
[PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats.
Also remove code that overwrites the C versions of functions in
sws_init_swScale_altivec(), so that it uses the C functions of files
if no altivec-optimized version exists.
Martin Aumüller [Sat, 14 May 2011 08:10:27 +0000 (10:10 +0200)]
arm: properly mark external symbol call
Surround memset and ff_vp8_dct_cat_prob by X() in order to fix iOS build
Includes patch by Luca Barbato <lu_zero@gentoo.org>.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Sat, 14 May 2011 00:54:28 +0000 (02:54 +0200)]
ffmpeg: Interactivity support. Try pressing +-hs.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sat, 14 May 2011 00:47:14 +0000 (02:47 +0200)]
swscale: 10l forgot git add this change from ronald.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 May 2011 00:19:23 +0000 (02:19 +0200)]
Merge remote branch 'qatar/master'
* qatar/master:
swscale: properly inline bits/endianness in yuv2yuvX16inC().
(We didnt pull the bug) swscale: fix clipping of 9/10bit YUV420P.
Add av_clip_uintp2() function
(our patch / duplicate) dfa: fix buffer overflow checks to avoid integer overflows.
(our patch / duplicate) movenc: always write esds descriptor length using 4 bytes.
(our patch / duplicate) ffmpeg: use parse_number_and_die() when it makes sense
(No thanks) ffmpeg: get rid of the 'q' key schizofrenia
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 May 2011 22:11:10 +0000 (00:11 +0200)]
AVFrame: only set parameters from AVCodecContext in decode_video*() when no frame reordering is used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 May 2011 21:23:30 +0000 (23:23 +0200)]
avcodec_default_get_buffer: init picture parameters.
Fixes multithreading regression introduced in
64c06615d2b99fb9f4ffd6226d0e5787b44a41e2
Fixes ticket197
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Fri, 13 May 2011 14:28:49 +0000 (10:28 -0400)]
swscale: properly inline bits/endianness in yuv2yuvX16inC().
Ronald S. Bultje [Fri, 13 May 2011 20:45:04 +0000 (16:45 -0400)]
swscale: fix clipping of 9/10bit YUV420P.
Mans Rullgard [Fri, 13 May 2011 15:39:17 +0000 (16:39 +0100)]
Add av_clip_uintp2() function
Signed-off-by: Mans Rullgard <mans@mansr.com>
ami_stuff [Fri, 13 May 2011 16:10:33 +0000 (18:10 +0200)]
Support more QT 1bpp rawvideo files.
Fixes ticket #189.
Michael Niedermayer [Fri, 13 May 2011 15:49:00 +0000 (17:49 +0200)]
UDP: udp depends on pthreads now
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 May 2011 15:16:15 +0000 (17:16 +0200)]
udp: switch custom fifo to libavutil fifo.
This also allows us to drop the semaphore as our fifo is lock free.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 May 2011 14:31:05 +0000 (16:31 +0200)]
udp: use FFMAX&FFMIN.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
JULIAN GARDNER [Fri, 13 May 2011 14:28:42 +0000 (16:28 +0200)]
udp: add a thread into udp.c for receiving data into a circular buffer, this stops the problem of live decoding/encoding giving errors.
Also added a buf_size which is the number of TS packets that to be allocated for the circular buffer.
Stefano Sabatini [Fri, 13 May 2011 00:07:09 +0000 (02:07 +0200)]
tiffenc: set bpp table for monow/monob formats
Also makes the bpp_tab non static const, as it needs to be changed in
this case.
Fix encoding of monow/monob images, fix trac issue #193.
Stefano Sabatini [Fri, 13 May 2011 00:03:18 +0000 (02:03 +0200)]
tiffenc: factorize code for monow/monob case in encode_frame() switch
Reduce code duplication, increase robustness.
Stefano Sabatini [Thu, 12 May 2011 23:49:15 +0000 (01:49 +0200)]
tiffenc: fix bpp value for monow/monob formats
Stefano Sabatini [Mon, 9 May 2011 20:11:57 +0000 (22:11 +0200)]
tiff: fix linesize for mono-white/black formats
Fix decoding of file Test_1bpp.tif, fix trac issue #171.
Stefano Sabatini [Mon, 9 May 2011 19:26:39 +0000 (21:26 +0200)]
tiff: print log in case of unknown / unsupported tag
Helps debugging.
Reimar Döffinger [Tue, 29 Mar 2011 19:14:55 +0000 (21:14 +0200)]
dfa: fix buffer overflow checks to avoid integer overflows.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Baptiste Coudurier [Wed, 30 Mar 2011 21:08:16 +0000 (14:08 -0700)]
movenc: always write esds descriptor length using 4 bytes.
ipod shuffle doesn't support anything else.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Stefano Sabatini [Mon, 11 Apr 2011 11:16:07 +0000 (13:16 +0200)]
ffmpeg: use parse_number_and_die() when it makes sense
Prefer parse_number_or_die() over atoi()/atol() parsing for the options:
-pass, -top, -vc, and -qscale.
Improve input validation.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Thu, 12 May 2011 13:15:07 +0000 (15:15 +0200)]
ffmpeg: get rid of the 'q' key schizofrenia
SIGINT for quitting should be enough for everybody.
Michael Niedermayer [Fri, 13 May 2011 03:10:24 +0000 (05:10 +0200)]
Add checksums specific to BE machines after last swscale update.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 May 2011 02:40:40 +0000 (04:40 +0200)]
Merge remote branch 'qatar/master'
* qatar/master: (33 commits)
rtpdec_qdm2: Don't try to parse data packet if no configuration is received
ac3enc: put the counting of stereo rematrixing bits in the same place to make the code easier to understand.
ac3enc: clean up count_frame_bits() and count_frame_bits_fixed()
mpegvideo: make FF_DEBUG_DCT_COEFF output coeffs via av_log() instead of just via AVFrame.
srtdec: make sure we don't write past the end of buffer
wmaenc: improve channel count and bitrate error handling in encode_init()
matroskaenc: make sure we don't produce invalid file with no codec ID
matroskadec: check that pointers were initialized before accessing them
lavf: fix function name in compute_pkt_fields2 av_dlog message
lavf: fix av_find_best_stream when providing a wanted stream.
lavf: fix av_find_best_stream when decoder_ret is given and using a related stream.
ffmpeg: factorize quality calculation
tiff: add support for SamplesPerPixel tag in tiff_decode_tag()
tiff: Prefer enum TiffCompr over int for TiffContext.compr.
mov: Support edit list atom version 1.
configure: Enable libpostproc automatically if GPL code is enabled.
Cosmetics: fix prototypes in oggdec
oggdec: fix memleak with continuous streams.
matroskaenc: add missing new line in av_log() call
dnxhdenc: add AVClass in private context.
...
swscale changes largely rewritten by me or replaced by baptsites due to lots of bugs in ronalds code.
Above code is also just in case its not obvios to a large extended duplicates that where cherry picked
from ffmpeg.
Conflicts:
configure
ffmpeg.c
libavformat/matroskaenc.c
libavutil/pixfmt.h
libswscale/ppc/swscale_template.c
libswscale/swscale.c
libswscale/swscale_template.c
libswscale/utils.c
libswscale/x86/swscale_template.c
tests/fate/h264.mak
tests/ref/lavfi/pixdesc_le
tests/ref/lavfi/pixfmts_copy_le
tests/ref/lavfi/pixfmts_null_le
tests/ref/lavfi/pixfmts_scale_le
tests/ref/lavfi/pixfmts_vflip_le
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 12 May 2011 23:08:01 +0000 (01:08 +0200)]
Support Digital Voodoo SD 8 Bit in mov (ticket 195).
ami_stuff [Thu, 12 May 2011 22:49:29 +0000 (00:49 +0200)]
Support R10g in mov.
Carl Eugen Hoyos [Thu, 12 May 2011 22:23:30 +0000 (00:23 +0200)]
Add 5.1 plus stereo-downmix to mov_channel_layout array.
Carl Eugen Hoyos [Thu, 12 May 2011 22:23:00 +0000 (00:23 +0200)]
Set channel_layout for S302M.
Carl Eugen Hoyos [Thu, 12 May 2011 22:22:05 +0000 (00:22 +0200)]
Map mlp surround channels to FFmpeg rear channels.
This allows more 3rd party applications to correctly read
the resulting wav files.
Alexandre Colucci [Thu, 12 May 2011 22:21:19 +0000 (00:21 +0200)]
Support native DTS channel order when requested.
Martin Storsjö [Thu, 12 May 2011 19:47:53 +0000 (22:47 +0300)]
rtpdec_qdm2: Don't try to parse data packet if no configuration is received
The later parsing of payload data depends on the configuration
being present. If it hasn't been configured properly yet,
parsing a data packet may lead to a crash.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 12 May 2011 18:05:47 +0000 (20:05 +0200)]
pixfmt-Comment: Fix big/little typo
Found-by: kierank
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Sat, 30 Apr 2011 19:55:18 +0000 (15:55 -0400)]
ac3enc: put the counting of stereo rematrixing bits in the same place to
make the code easier to understand.
Justin Ruggles [Sat, 30 Apr 2011 19:52:55 +0000 (15:52 -0400)]
ac3enc: clean up count_frame_bits() and count_frame_bits_fixed()
Michael Niedermayer [Wed, 23 Feb 2011 22:38:52 +0000 (23:38 +0100)]
mpegvideo: make FF_DEBUG_DCT_COEFF output coeffs via av_log() instead of just via AVFrame.
This allows the values to be used without changing C code and is closer to how
the other DEBUG flags work.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Aurelien Jacobs [Fri, 25 Mar 2011 00:02:53 +0000 (01:02 +0100)]
srtdec: make sure we don't write past the end of buffer
Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Tomas Härdin [Mon, 21 Mar 2011 09:52:36 +0000 (10:52 +0100)]
wmaenc: improve channel count and bitrate error handling in encode_init()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Aurelien Jacobs [Thu, 24 Mar 2011 00:56:26 +0000 (01:56 +0100)]
matroskaenc: make sure we don't produce invalid file with no codec ID
Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Aurelien Jacobs [Wed, 23 Mar 2011 23:28:19 +0000 (00:28 +0100)]
matroskadec: check that pointers were initialized before accessing them
Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Stefano Sabatini [Thu, 17 Mar 2011 11:52:40 +0000 (12:52 +0100)]
lavf: fix function name in compute_pkt_fields2 av_dlog message
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Marton Balint [Sun, 20 Feb 2011 00:18:30 +0000 (01:18 +0100)]
lavf: fix av_find_best_stream when providing a wanted stream.
In the main loop, stream_number is incremented after checking the stream type,
so the search usually will not find the wanted stream.
This patch eliminates the useless stream_number variable and introduces a new
one, called real_stream_index to store the real stream index of the current
stream, no matter if we are looping through all the streams or only the streams
of a program.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Marton Balint [Sun, 20 Feb 2011 00:18:49 +0000 (01:18 +0100)]
lavf: fix av_find_best_stream when decoder_ret is given and using a related stream.
Yet another fix for the code originally designed for use without related_stream.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Wed, 6 Apr 2011 19:17:32 +0000 (21:17 +0200)]
ffmpeg: factorize quality calculation
Calculate quality value once per stream in print_report().
Also fix segfault, as coded_frame can be NULL.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Stefano Sabatini [Mon, 9 May 2011 10:51:24 +0000 (12:51 +0200)]
tiff: add support for SamplesPerPixel tag in tiff_decode_tag()
Format detection and internal frame initialization is moved to a
separate init_image() function, which is called when all the tags have
been read, and so both BitsPerSample and SamplesPerPixel information
has been collected.
This fixes decoding of the file 11.tiff from roundup issue #1925.
Based on a patch by Kostya Shishkov <kostya.shishkov@gmail.com>.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Thu, 12 May 2011 15:46:02 +0000 (17:46 +0200)]
ffv1: Add PIX_FMT_YUV420P9 support.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 9 May 2011 19:05:42 +0000 (21:05 +0200)]
tiff: Prefer enum TiffCompr over int for TiffContext.compr.
This is safer and helps debugging.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Thu, 12 May 2011 15:27:31 +0000 (17:27 +0200)]
ffv1dec: output PIX_FMT_YUV422P10 and PIX_FMT_YUV420P10 when possible.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ivan Kalvachev [Thu, 12 May 2011 13:11:27 +0000 (16:11 +0300)]
Fix posix_memalign() usage when libavutil is compiled outside FFmpeg.
To use posix_memalign() "#define _XOPEN_SOURCE 600" have to be defined.
FFmpeg configure defines it from the command line through config.mak,
but when libavutil is used outside of FFmpeg the define is missing.
Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Uoti Urpala [Sun, 24 Apr 2011 04:21:30 +0000 (07:21 +0300)]
asfdec: fix assert failure on invalid files
Add an extra size validity check in asf_read_frame_header(). Without
this asf->packet_size_left may become negative, which triggers an
assertion failure later.
Michael Niedermayer [Thu, 12 May 2011 14:04:13 +0000 (16:04 +0200)]
Revert "asfdec: fix assert failure on invalid files"
Reverting this pulled change as author considers this change buggy compared to his
original version.
This reverts commit
0bd433a916cd8d98fce47742fbf6d0f90ec941c4.
Yusuke Nakamura [Wed, 11 May 2011 20:28:27 +0000 (05:28 +0900)]
mov: Support edit list atom version 1.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Måns Rullgård [Thu, 12 May 2011 12:21:49 +0000 (13:21 +0100)]
configure: Enable libpostproc automatically if GPL code is enabled.
Enabling libpostproc automatically should give it more compile coverage
and save the FATE box maintainers some configuration hassles.
ami_stuff [Thu, 12 May 2011 10:16:43 +0000 (12:16 +0200)]
Add support for QT BMP 1bpp color mode
Fix trac issue #188
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thierry Foucu [Wed, 11 May 2011 23:36:39 +0000 (16:36 -0700)]
If a MP3 file contains the string NSVs, the NSV probe will think it is a NSV file instead of a MP3 file. Check for 0xBEEF after a Video/Audio chunck for more accuracy.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 11 May 2011 18:43:29 +0000 (20:43 +0200)]
Cosmetics: fix prototypes in oggdec
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Clément Bœsch [Wed, 11 May 2011 18:43:27 +0000 (20:43 +0200)]
oggdec: fix memleak with continuous streams.
This avoids the creation of a new AVStream instead of replacing it when
a stream reset occurs (track change with some webradios for example).
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Aurelien Jacobs [Thu, 24 Mar 2011 00:54:15 +0000 (01:54 +0100)]
matroskaenc: add missing new line in av_log() call
Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Baptiste Coudurier [Wed, 30 Mar 2011 15:47:30 +0000 (08:47 -0700)]
dnxhdenc: add AVClass in private context.
Fixes private options.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Baptiste Coudurier [Wed, 23 Mar 2011 17:22:05 +0000 (10:22 -0700)]
movenc: fix yuv range in avid atoms used by dnxhd.
yuv range: full 1 / normal 2
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Alex Converse [Mon, 28 Feb 2011 00:29:21 +0000 (16:29 -0800)]
movenc: fix adpcm mono muxing.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Baptiste Coudurier [Mon, 28 Feb 2011 00:19:50 +0000 (16:19 -0800)]
mpegts: do not output known sized packet if an unbounded packet is already queued.
Fix issue #2624.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Stefano Sabatini [Sun, 13 Mar 2011 20:22:59 +0000 (21:22 +0100)]
ffprobe: tweak error message in open_input_file()
Replace "codec (id=%d)" with "codec with id %d", slightly more
readable.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Peter Ross [Fri, 18 Mar 2011 11:28:52 +0000 (22:28 +1100)]
patcheck: warn about assert usage
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Stefano Sabatini [Fri, 25 Mar 2011 17:49:24 +0000 (18:49 +0100)]
configure: sort filter deps entries
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diego Biurrun [Fri, 29 Apr 2011 14:08:20 +0000 (16:08 +0200)]
Replace int_fast integer types with their sized standard posix counterparts.
The _fast integer types provide no realworld benefits, but may introduce
portability issues and are just plain ugly.
Diego Biurrun [Fri, 29 Apr 2011 18:17:43 +0000 (20:17 +0200)]
jfdct: Replace sized int_fast integer types with plain int/unsigned.
int/unsigned is the natural memory access type for CPUs, using sized types
for temporary variables, counters and similar just increases code size and
can possibly cause a slowdown.
Diego Biurrun [Wed, 11 May 2011 15:52:51 +0000 (17:52 +0200)]
configure: Do not unconditionally add -D_POSIX_C_SOURCE to CPPFLAGS.
Adding _POSIX_C_SOURCE to CPPFLAGS globally produces all sorts of problems
since it causes certain system functions to be hidden on some (BSD) systems.
The solution is to only add the flag on systems that really require it, i.e.
glibc-based ones.
This change makes BSD systems compile out-of-the-box without the need for
adding specific flags manually. It also allows dropping a number of flags
set manually on a file-per-file basis, but were only present to work around
breakage introduced by the presence of _POSIX_C_SOURCE.
Also add _XOPEN_SOURCE to CPPFLAGS for glibc systems. We use XSI extensions
in several places already, so it is preferable to define it globally instead
of littering source files with individual #defines only needed for glibc.
Thierry Foucu [Thu, 12 May 2011 04:27:04 +0000 (21:27 -0700)]
nsv: Fix misdetection of MP3 files as NSV.
If an MP3 file contains the string NSVs, the NSV probe will confuse it for an
NSV file. Check for 0xBEEF after a Video/Audio chunk to achieve more accuracy.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Clément Bœsch [Wed, 11 May 2011 18:43:31 +0000 (20:43 +0200)]
oggdec: use explicit AVInputFormat struct initializers
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Clément Bœsch [Wed, 11 May 2011 18:43:30 +0000 (20:43 +0200)]
oggdec: simplify ogg_probe
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Thu, 12 May 2011 02:51:24 +0000 (04:51 +0200)]
Merge remote branch 'qatar/master'
* qatar/master: (32 commits)
10-bit H.264 x86 chroma v loopfilter asm
Port SMPTE S302M audio decoder from FFmbc 0.3. [Copyright headers corrected]
Fix crash of interlaced MPEG2 decoding
h264pred: fix one more aliasing violation.
doc/APIchanges: fill in missing hashes and dates.
flacenc: use proper initializers for AVOption default values.
lavc: deprecate named constants for deprecated antialias_algo.
aac: workaround for compilation on cygwin
swscale: extend YUV422p support to 10bits depth
tiff: add support for inverted FillOrder for uncompressed data
Remove unused softfloat implementation.
h264pred: fix aliasing violations.
rotozoom: Eliminate French variable name.
rotozoom: Check return value of fread().
rotozoom: Return an error value instead of calling exit().
rotozoom: Make init_demo() return int and check for errors on invocation.
rotozoom: Drop silly UINT8 typedef.
rotozoom: Drop some unnecessary parentheses.
rotozoom: K&R coding style cosmetics
rtsp: Only do keepalive using GET_PARAMETER if the server supports it
...
Conflicts:
Changelog
cmdutils.c
doc/APIchanges
doc/general.texi
ffmpeg.c
ffplay.c
libavcodec/h264pred_template.c
libavcodec/resample.c
libavutil/pixfmt.h
libavutil/softfloat.c
libavutil/softfloat.h
tests/rotozoom.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 May 2011 01:40:21 +0000 (03:40 +0200)]
libavformat/utils: Only consider dvb teletext timestamps for start time when they are consistent with the rest.
This fixes Ticket51.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 May 2011 01:03:08 +0000 (03:03 +0200)]
error concealment: check last pictures motion_val before using it.
Fixes NULL pointer dereference.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 May 2011 00:26:22 +0000 (02:26 +0200)]
sws-PPC: fix after VOFW change.
It seems sws-PPC did hardcode 2048 at various places instead of using VOFW.
This also means that all past VOFW benchmarks on PPC are meaningless
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Wed, 11 May 2011 23:15:14 +0000 (19:15 -0400)]
swscale: fix YUV420P 9/10bit support.
Fix handling of input if not in native endianness, and add support for
9/10-bit output. This allows us to force endianness of YUV420P 9/10bit
in the H264/10bit fate tests, which should fix them on big-endian
systems.
Michael Niedermayer [Wed, 11 May 2011 21:58:17 +0000 (23:58 +0200)]
regtests: add grayscale qtrle
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
John Horigan [Sun, 8 May 2011 18:52:54 +0000 (11:52 -0700)]
Added PIX_FMT_GRAY8 to the formats supported by the QuickTime RLE encoder
The QuickTime RLE encoder only supports 16, 24, and 32-bit color. This patch adds support
for 8-bit grayscale.
Signed-off-by: John Horigan <john@glyphic.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ami_stuff [Tue, 10 May 2011 13:34:08 +0000 (15:34 +0200)]
Use VOFW 21503 as a default value for all types of the CPUs
ami_stuff [Wed, 11 May 2011 20:18:15 +0000 (22:18 +0200)]
Add "DAVC" FourCC
This FourCC is used by "mpegable AVC" codec and the file encoded with this codec decodes correctly with FFmpeg's H264 decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
anatoly [Tue, 22 Feb 2011 09:04:50 +0000 (12:04 +0300)]
Fix crash of interlaced MPEG2 decoding
Michael Niedermayer [Wed, 11 May 2011 18:41:19 +0000 (20:41 +0200)]
av_compare_ts: Improve speed when calculations fit in 64bit.
about 110 cpu cycles before 60 cpu cycles afterwards.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kyle [Wed, 11 May 2011 18:22:33 +0000 (20:22 +0200)]
configure: Fix SDL detection on OSX and win32
Jason Garrett-Glaser [Wed, 11 May 2011 17:11:55 +0000 (10:11 -0700)]
10-bit H.264 x86 chroma v loopfilter asm
Also delete some unused deblock asm macros.
Michael Niedermayer [Wed, 11 May 2011 16:09:26 +0000 (18:09 +0200)]
fate: Disable h264-conformance-frext-pph10i4_panasonic_a.
The file does not decode correctly yet the checksums match this wrongly
decoded file. Thus the checksums must be wrong.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Baptiste Coudurier [Tue, 12 Apr 2011 22:29:09 +0000 (15:29 -0700)]
Port SMPTE S302M audio decoder from FFmbc 0.3.
Ronald S. Bultje [Wed, 11 May 2011 15:22:41 +0000 (17:22 +0200)]
h264pred: fix one more aliasing violation.
Michael Niedermayer [Wed, 11 May 2011 14:32:35 +0000 (16:32 +0200)]
h264-fate: Fix 10bit H264 tests on big endian.
framecrc returns different values when one swiches endianness,
this apparently has been missed by "the fork" who added the 10bit fate
tests. Sorry for missing this during the merge.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>