OSDN Git Service
Michael Niedermayer [Wed, 15 Feb 2012 00:38:34 +0000 (01:38 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
CDXL demuxer and decoder
hls: Re-add legacy applehttp name to preserve interface compatibility.
hlsproto: Rename the functions and context
hlsproto: Encourage users to try the hls demuxer instead of the proto
doc: Move the hls protocol section into the right place
libavformat: Rename the applehttp protocol to hls
hls: Rename the functions and context
libavformat: Rename the applehttp demuxer to hls
rtpdec: Support H263 in RFC 2190 format
rv30: check block type validity
ttadec: CRC checking
movenc: Support muxing VC1
avconv: Don't split out inline sequence headers when stream copying VC1
rv34: handle size changes during frame multithreading
rv40: prevent undefined signed overflow in rv40_loop_filter()
rv34: use AVERROR return values in ff_rv34_decode_frame()
rv34: use uint16_t for RV34DecContext.deblock_coefs
librtmp: Add "lib" prefix to librtmp URLProtocol declarations.
movenc: Use defines instead of hardcoded numbers for RTCP types
smjpegdec: implement seeking
...
Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/rv30.c
libavcodec/tta.c
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/version.h
libswscale/x86/swscale_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Feb 2012 23:20:24 +0000 (00:20 +0100)]
swscale: enable some more SIMD functions.
They no longer just segfault.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 14 Feb 2012 05:39:03 +0000 (05:39 +0000)]
ffv1: PIX_FMT_GRAY8 support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 14 Feb 2012 23:21:14 +0000 (00:21 +0100)]
lavfi/silencedetect: use av_ts2timestr() macro.
Paul B Mahol [Tue, 14 Feb 2012 17:36:20 +0000 (17:36 +0000)]
CDXL demuxer and decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Tue, 14 Feb 2012 19:41:19 +0000 (20:41 +0100)]
swscale: yuv2422_2_c_template() add cliping.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Feb 2012 19:33:39 +0000 (20:33 +0100)]
swscale: Add cliping to yuv2422_1_c_template()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Feb 2012 18:34:17 +0000 (19:34 +0100)]
swscale: Fix rounding in yuv2mono_1_c_template()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Feb 2012 17:44:34 +0000 (18:44 +0100)]
swscale: Fix rounding in yuv2rgb_1_c_template()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Feb 2012 17:33:14 +0000 (18:33 +0100)]
swscale: yuv2422_1_c_template: fix rounding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alex Converse [Tue, 14 Feb 2012 19:17:00 +0000 (11:17 -0800)]
hls: Re-add legacy applehttp name to preserve interface compatibility.
Martin Storsjö [Tue, 14 Feb 2012 10:16:31 +0000 (12:16 +0200)]
hlsproto: Rename the functions and context
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 14 Feb 2012 10:09:09 +0000 (12:09 +0200)]
hlsproto: Encourage users to try the hls demuxer instead of the proto
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 14 Feb 2012 10:04:50 +0000 (12:04 +0200)]
doc: Move the hls protocol section into the right place
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 14 Feb 2012 10:00:49 +0000 (12:00 +0200)]
libavformat: Rename the applehttp protocol to hls
Keep the old protocol name around for backwards compatibility
until the next bump.
Deprecate the method of implicitly assuming the nested protocol.
For applehttp://server/path, it might have felt logical, but
supporting hls://server/path isn't quite as intuitive. Therefore
only support hls+http://server/path from now on.
Using this protocol at all is discouraged, since the hls demuxer
is more complete and fits into the architecture better. There
have been cases where the protocol implementation worked better
than the demuxer, but this should no longer be the case.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 14 Feb 2012 09:50:51 +0000 (11:50 +0200)]
hls: Rename the functions and context
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 14 Feb 2012 09:47:31 +0000 (11:47 +0200)]
libavformat: Rename the applehttp demuxer to hls
When this demuxer was created, there didn't seem to be any
consensus of a common short name for this protocol. Now
the consensus seems to be to call it hls.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 7 Feb 2012 14:15:26 +0000 (16:15 +0200)]
rtpdec: Support H263 in RFC 2190 format
This is different from the "modern" RTP payload formats for H263
as defined by RFC 4629, 2429 and 3555. According to the newer RFCs,
this old one is to be considered deprecated and only be used for
interoperating with legacy systems.
Signed-off-by: Martin Storsjö <martin@martin.st>
Janne Grunau [Tue, 14 Feb 2012 14:02:30 +0000 (15:02 +0100)]
rv30: check block type validity
Prevents crashes with the fuzzed samples from bugs 88, 89 and 125 after
"golomb: avoid infinite loop on all-zero input".
Paul B Mahol [Sat, 11 Feb 2012 21:30:30 +0000 (21:30 +0000)]
ttadec: CRC checking
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Stefano Sabatini [Thu, 9 Feb 2012 22:59:16 +0000 (23:59 +0100)]
lavfi/ashowinfo: only print checksum for the existing planes
Make the output a bit nicer.
Stefano Sabatini [Thu, 9 Feb 2012 18:42:17 +0000 (19:42 +0100)]
lavfi/showinfo: only print checksum for the existing planes
Make the output a bit nicer.
Stefano Sabatini [Thu, 9 Feb 2012 18:30:26 +0000 (19:30 +0100)]
lavfi/*showinfo: use av_ts2* macros in showinfo and ashowinfo
Stefano Sabatini [Fri, 20 Jan 2012 16:06:26 +0000 (17:06 +0100)]
ffmpeg.c: implement -debug_ts option
Mostly useful for debugging purposes.
Martin Storsjö [Sat, 21 Jan 2012 00:16:34 +0000 (02:16 +0200)]
movenc: Support muxing VC1
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 23 Jan 2012 11:06:07 +0000 (13:06 +0200)]
avconv: Don't split out inline sequence headers when stream copying VC1
This is required when stream copying VC1 in ismv - there's one
global header in the moov atom, but keyframes have a separate
sequence header prepended.
Signed-off-by: Martin Storsjö <martin@martin.st>
Janne Grunau [Mon, 13 Feb 2012 20:10:48 +0000 (21:10 +0100)]
rv34: handle size changes during frame multithreading
Factors all context dynamic memory handling to its own functions.
Fixes bug 220.
Janne Grunau [Mon, 13 Feb 2012 21:12:54 +0000 (22:12 +0100)]
rv40: prevent undefined signed overflow in rv40_loop_filter()
Janne Grunau [Mon, 13 Feb 2012 20:14:19 +0000 (21:14 +0100)]
rv34: use AVERROR return values in ff_rv34_decode_frame()
Also adds an error message.
Janne Grunau [Thu, 9 Feb 2012 20:19:16 +0000 (21:19 +0100)]
rv34: use uint16_t for RV34DecContext.deblock_coefs
It is used as bitfield with 16 entries.
Carl Eugen Hoyos [Tue, 14 Feb 2012 11:03:55 +0000 (12:03 +0100)]
Fix compilation with old yasm that does not support AVX.
Diego Biurrun [Mon, 13 Feb 2012 18:37:25 +0000 (19:37 +0100)]
librtmp: Add "lib" prefix to librtmp URLProtocol declarations.
This allows easily differentiating between both implementations within the build
system and combining the native implementation for plain RTMP with librtmp for
the RTMPE, RTMPS, RTMPT, RTMPTE protocol variants.
Martin Storsjö [Tue, 14 Feb 2012 09:10:52 +0000 (11:10 +0200)]
movenc: Use defines instead of hardcoded numbers for RTCP types
Signed-off-by: Martin Storsjö <martin@martin.st>
Paul B Mahol [Tue, 14 Feb 2012 03:48:42 +0000 (03:48 +0000)]
smjpegdec: implement seeking
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Mon, 13 Feb 2012 19:03:30 +0000 (20:03 +0100)]
swscale: Remove some write-only variables related to alpha handling.
Michael Niedermayer [Tue, 14 Feb 2012 02:23:58 +0000 (03:23 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: fix crashes in yuv2yuvX on x86-32.
sunrast: Add fate test for gray8.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 14 Feb 2012 00:47:50 +0000 (00:47 +0000)]
lavc: add missing PIX_FMT_YUVA444P
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Feb 2012 00:53:31 +0000 (01:53 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtpdec: Use 4 byte startcodes for H.264
matroskadec: Mark variable as av_unused.
Move some conditionally used variables into the block where they are used.
Drop some completely unnecessary av_unused attributes.
swscale: Remove unused variable alpMmxFilter.
Drop unnecessary av_uninit attributes from some variable declarations.
movenc: Support muxing wmapro in ismv/isma
mpegtsenc: Add an AVOption for forcing a new PAT/PMT/SDT to be written
swscale: move YUV2PACKED16WRAPPER() macro down to where it is used.
swscale: handle gray16 as a "planar" YUV format (Y-only, of course).
swscale: use yuv2packed1() functions for unscaled chroma also.
swscale: fix incorrect chroma bias in yuv2rgb48_1_c().
swscale: fix invalid memory accesses in yuvpacked1() functions.
Move PS2 MMI code below the mips subdirectory, where it belongs.
mips: Move MMI function declarations to a header.
build: Set correct dependencies for rtmp* protocols implemented by librtmp.
Conflicts:
libavcodec/ac3enc_template.c
libavformat/mpegtsenc.c
libswscale/output.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Feb 2012 22:51:37 +0000 (23:51 +0100)]
jpeglsdec: fix bpp & limit.
Fixes: Tikcet969
Thanks-to: ITU for the freely available spec.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Feb 2012 22:50:35 +0000 (23:50 +0100)]
jpeglsdec: Prevent out of array write.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Feb 2012 21:04:22 +0000 (22:04 +0100)]
iff: Fix decode_ham_plane32() buf_size.
The wrong variable was passed into decode_ham_plane32()
Fixes: Ticket922
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 13 Feb 2012 22:24:31 +0000 (23:24 +0100)]
ffmpeg: remove unneeded ost->picref check.
If there ost->picref is NULL, it will likely crash anyway a few lines
below by dereferencing it in order to access video attribute.
Clément Bœsch [Mon, 13 Feb 2012 22:23:15 +0000 (23:23 +0100)]
ffmpeg: remove pointless avcodec_get_frame_defaults().
filtered_frame is overwritten just below anyway.
Clément Bœsch [Mon, 13 Feb 2012 22:21:50 +0000 (23:21 +0100)]
ffmpeg: raise ENOMEM on avfilter_graph_alloc() failure.
Ronald S. Bultje [Mon, 13 Feb 2012 21:28:50 +0000 (13:28 -0800)]
swscale: fix crashes in yuv2yuvX on x86-32.
They were introduced in an earlier commit that introduced use of named
arguments. One cause was a typo, a second cause appears to be a bug in
x264asm that I work around by not using named arguments.
Aneesh Dogra [Sun, 12 Feb 2012 17:48:49 +0000 (17:48 +0000)]
sunrast: Add fate test for gray8.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Matthew Szatmary [Wed, 8 Feb 2012 13:00:40 +0000 (15:00 +0200)]
rtpdec: Use 4 byte startcodes for H.264
If muxing into mpegts, 4 byte startcodes for the first NAL
of an access unit is required. Thus it is simplest for the
RTP depacketizer to just use 4 byte startcodes everywhere.
Signed-off-by: Martin Storsjö <martin@martin.st>
Reimar Döffinger [Mon, 13 Feb 2012 20:29:26 +0000 (21:29 +0100)]
Update mkv seek tests.
Seek beyond the end will now directly return an error instead
of claiming to succeed and then return EOF immediately on next read.
This change is because before
47e015e6f1913f7da943898eb7716a954f947ff7
mkv seek incorrectly never failed.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sun, 12 Feb 2012 13:09:03 +0000 (14:09 +0100)]
matroskadec: properly fall back to generic seek.
In particular, detect when the index is obviously broken.
This fixes the worst symptoms of trac issue #958 and makes
sense to allow seeking in files without index.
However it is possible that there still is an index parsing bug
with that file.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sun, 12 Feb 2012 13:07:04 +0000 (14:07 +0100)]
matroskadec: reset num_levels on seek.
Otherwise when we run into levels beyond the max. allowed
playback will be permanently broken.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diego Biurrun [Sun, 12 Feb 2012 09:58:46 +0000 (10:58 +0100)]
matroskadec: Mark variable as av_unused.
This avoids unused variable warnings when zlib/bzlib are not available.
Diego Biurrun [Fri, 10 Feb 2012 14:10:42 +0000 (15:10 +0100)]
Move some conditionally used variables into the block where they are used.
This allows dropping the av_unused argument from them.
Diego Biurrun [Fri, 10 Feb 2012 14:13:32 +0000 (15:13 +0100)]
Drop some completely unnecessary av_unused attributes.
Diego Biurrun [Fri, 10 Feb 2012 14:04:37 +0000 (15:04 +0100)]
swscale: Remove unused variable alpMmxFilter.
Diego Biurrun [Mon, 13 Feb 2012 07:24:00 +0000 (08:24 +0100)]
Drop unnecessary av_uninit attributes from some variable declarations.
Recent versions of gcc (4.4+) no longer give false positive warnings.
Martin Storsjö [Mon, 23 Jan 2012 12:58:38 +0000 (14:58 +0200)]
movenc: Support muxing wmapro in ismv/isma
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 29 Jan 2012 00:12:06 +0000 (02:12 +0200)]
mpegtsenc: Add an AVOption for forcing a new PAT/PMT/SDT to be written
When segmenting the output from the mpegts muxer, one can
now set this option when cutting to a new segment, to make sure
the next segment starts with PAT/PMT/SDT.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Mon, 13 Feb 2012 01:10:32 +0000 (17:10 -0800)]
swscale: move YUV2PACKED16WRAPPER() macro down to where it is used.
Ronald S. Bultje [Mon, 13 Feb 2012 01:07:09 +0000 (17:07 -0800)]
swscale: handle gray16 as a "planar" YUV format (Y-only, of course).
This allows removing any gray16-specific code, which is essentially
identical to the per-plane code in yuv2plane*().
Ronald S. Bultje [Sun, 12 Feb 2012 23:48:24 +0000 (15:48 -0800)]
swscale: use yuv2packed1() functions for unscaled chroma also.
Ronald S. Bultje [Sun, 12 Feb 2012 23:55:44 +0000 (15:55 -0800)]
swscale: fix incorrect chroma bias in yuv2rgb48_1_c().
Ronald S. Bultje [Sun, 12 Feb 2012 23:47:14 +0000 (15:47 -0800)]
swscale: fix invalid memory accesses in yuvpacked1() functions.
Diego Biurrun [Tue, 7 Feb 2012 14:06:09 +0000 (15:06 +0100)]
Move PS2 MMI code below the mips subdirectory, where it belongs.
Also give a more suitable name to the MMI-optimized IDCT;
it is not PS2-specific, as the name currently suggests.
Diego Biurrun [Sat, 11 Feb 2012 20:56:37 +0000 (21:56 +0100)]
mips: Move MMI function declarations to a header.
This fixes compilation with -Werror=missing-prototypes.
Diego Biurrun [Fri, 10 Feb 2012 19:29:29 +0000 (20:29 +0100)]
build: Set correct dependencies for rtmp* protocols implemented by librtmp.
Michael Niedermayer [Mon, 13 Feb 2012 00:39:11 +0000 (01:39 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: convert yuv2yuvX() to using named arguments.
swscale: rename "dstw" to "w" to prevent name collisions.
swscale: use named registers in yuv2yuv1_plane() place.
lavf: fix aspect ratio mismatch message.
avconv: set AVFormatContext.duration from '-t'
cljr: implement encode2.
cljr: set the properties of the coded_frame, not input frame.
dnxhdenc: switch to encode2.
bmpenc: switch to encode2().
Conflicts:
libavcodec/bmpenc.c
libavcodec/cljr.c
libavformat/utils.c
tests/ref/vsynth1/cljr
tests/ref/vsynth2/cljr
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sun, 12 Feb 2012 20:37:08 +0000 (21:37 +0100)]
Fix compilation without HAVE_AVX.
%ifdef HAVE_AVX must now be %if HAVE_AVX.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Sat, 11 Feb 2012 19:14:33 +0000 (20:14 +0100)]
threads: Perform the generic progress cleanup more carefully.
The cleanup is only done now when
a picture is returned (assuming that it has to be done when its returned)
a error is returned (assuming that there will be no further progress on the frame)
the codec is not h264 (this is still needed due to some deadlocks in realvideo)
This fixes a decoding regression with 00017.MTS
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Feb 2012 19:13:23 +0000 (20:13 +0100)]
threads: move state update after progress cleanup.
This order is more logic and might prevent a race.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Feb 2012 19:11:18 +0000 (20:11 +0100)]
h264: Mark previous field as done before throwing it away.
This fixes some deadlock without the generic cleanup code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Sun, 12 Feb 2012 14:47:31 +0000 (16:47 +0200)]
Fix aspect ratio mismatch message
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sun, 12 Feb 2012 10:50:01 +0000 (11:50 +0100)]
Simplify: use local variable with same contents directly.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sun, 12 Feb 2012 09:52:42 +0000 (10:52 +0100)]
Fix Theora-in-ogg keyframe handling.
To make seeking work correctly, we must write a new granule for
each keyframe.
Unfortunately we currently have no regression tests due to no
included Theora encoder.
A test based on -vcodec copy from a Theora FATE sample should
probably be added.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 11 Feb 2012 15:04:43 +0000 (16:04 +0100)]
Detect and check for CMOV.
Some MMX-only CPUs do not have support for CMOV.
All SSE/MMX2 CPUs should be fine, thus no check was
added to those functions.
See also https://sourceforge.net/tracker/?func=detail&aid=
3358347&group_id=205275&atid=992986
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Ronald S. Bultje [Sun, 12 Feb 2012 01:51:52 +0000 (17:51 -0800)]
swscale: convert yuv2yuvX() to using named arguments.
Ronald S. Bultje [Sun, 12 Feb 2012 02:46:12 +0000 (18:46 -0800)]
swscale: rename "dstw" to "w" to prevent name collisions.
"dstw" can collide with the word-version of the "dst" argument, causing
all kind of weird stuff down the pipe.
Ronald S. Bultje [Sun, 12 Feb 2012 01:02:29 +0000 (17:02 -0800)]
swscale: use named registers in yuv2yuv1_plane() place.
Most of the function had been converted before, but I forgot this
particular location.
Andrey Utkin [Sun, 12 Feb 2012 14:46:46 +0000 (16:46 +0200)]
lavf: fix aspect ratio mismatch message.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Andrey Utkin [Sun, 5 Feb 2012 14:49:14 +0000 (16:49 +0200)]
avconv: set AVFormatContext.duration from '-t'
Set output files duration to recording_time option, if given.
Rationale: to save duration into metadata for file that is written to
non-seekable output, for formats like FLV (with metadata at beginning).
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Sat, 11 Feb 2012 19:39:12 +0000 (20:39 +0100)]
cljr: implement encode2.
Anton Khirnov [Sat, 11 Feb 2012 19:37:41 +0000 (20:37 +0100)]
cljr: set the properties of the coded_frame, not input frame.
Anton Khirnov [Sat, 11 Feb 2012 19:03:42 +0000 (20:03 +0100)]
dnxhdenc: switch to encode2.
Anton Khirnov [Sat, 11 Feb 2012 18:44:05 +0000 (19:44 +0100)]
bmpenc: switch to encode2().
Michael Niedermayer [Sun, 12 Feb 2012 00:02:55 +0000 (01:02 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: update reference for seek-alac_mp4
sunrast: Return AVERROR values instead of -1.
sunrast: Add support for gray8 decoding.
swscale: enforce a minimum filtersize.
alacenc: use AVCodec.encode2()
alacenc: cosmetics: indentation
alacenc: consolidate bitstream writing into a single function.
alacenc: only encode frame size in header for a final smaller frame
alacenc: store current frame size in AlacEncodeContext.
alacenc: return AVERROR codes in alac_encode_frame()
alacenc: calculate a new max frame size for the final small frame
alacenc: pretty-printing and other cosmetics
alacenc: fix error handling and potential memleaks in alac_encode_init()
alacenc: do not set coded_frame->key_frame
alacenc: do not set bits_per_coded_sample
alacenc: remove unneeded frame_size check in alac_encode_frame()
tta: error out if samplerate is zero.
ttadec: fix invalid free when an error occurs while decoding 24-bit tta
wavpack: add needed braces for 2 statements inside an if block
Conflicts:
tests/ref/acodec/alac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 11 Feb 2012 23:18:32 +0000 (00:18 +0100)]
Reduce the verbosity of a mpeg1/2 invalid intra-matrix warning.
Fixes ticket #973.
Michael Niedermayer [Sat, 11 Feb 2012 03:18:22 +0000 (04:18 +0100)]
ffmpeg: fix passlogfile with multiple libx264 streams.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 11 Feb 2012 22:57:18 +0000 (22:57 +0000)]
tta: reindent
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Pavel Koshevoy [Sat, 11 Feb 2012 01:19:08 +0000 (18:19 -0700)]
Modified to generate PAT/PMT for video keyframes
This is so that TS fragments produced by
http://code.google.com/p/httpsegmenter/
would be compatible with JW Player.
A new member variable prev_payload_key was added to MpegTSWriteStream
to help detect transition from non-key to key frame, so that
PAT/PMT would not be produced for every keyframe in intra-only videos.
Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Feb 2012 21:50:21 +0000 (22:50 +0100)]
lagarith: Fix out of array reads.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 11 Feb 2012 22:45:04 +0000 (23:45 +0100)]
ffv1: Assume encoding all bits is wanted if bits_per_raw_sample == 0.
Carl Eugen Hoyos [Sat, 11 Feb 2012 22:42:58 +0000 (23:42 +0100)]
Cosmetics: Move a block in ffv1's encode_init().
Makes the next patch smaller.
Justin Ruggles [Sat, 11 Feb 2012 20:58:04 +0000 (15:58 -0500)]
FATE: update reference for seek-alac_mp4
This should have been updated in
b590f3a7bf9103ac7a7a61c48568676201d6824b.
Aneesh Dogra [Sat, 11 Feb 2012 20:29:56 +0000 (01:59 +0530)]
sunrast: Return AVERROR values instead of -1.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Aneesh Dogra [Sat, 11 Feb 2012 05:12:45 +0000 (10:42 +0530)]
sunrast: Add support for gray8 decoding.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Ronald S. Bultje [Sat, 11 Feb 2012 16:42:28 +0000 (08:42 -0800)]
swscale: enforce a minimum filtersize.
At very small dimensions, this calculation could lead to zero-sized
filters, which leads to uninitialized output, zero-sized allocations,
loop overflows in SIMD that uses do{..}while(i++<filtersize); instead
of for(i=0;i<filtersize;i++){..} and several other similar failures.
Therefore, require a minimum filtersize of 1.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Justin Ruggles [Fri, 3 Feb 2012 23:04:58 +0000 (18:04 -0500)]
alacenc: use AVCodec.encode2()
Justin Ruggles [Fri, 3 Feb 2012 22:56:49 +0000 (17:56 -0500)]
alacenc: cosmetics: indentation
Justin Ruggles [Fri, 3 Feb 2012 22:53:41 +0000 (17:53 -0500)]
alacenc: consolidate bitstream writing into a single function.
Simplifies use of verbatim mode.
Justin Ruggles [Fri, 3 Feb 2012 22:27:31 +0000 (17:27 -0500)]
alacenc: only encode frame size in header for a final smaller frame
Otherwise it is not needed because it matches the frame size as encoded in
the extradata.
Justin Ruggles [Thu, 2 Feb 2012 23:06:28 +0000 (18:06 -0500)]
alacenc: store current frame size in AlacEncodeContext.
This avoids an indirection and will simplify implementation of encode2()