OSDN Git Service
JULIAN GARDNER [Fri, 14 Oct 2011 12:52:33 +0000 (14:52 +0200)]
dvbsubdec: Fix variable increments & checking in dvbsub_read_*bit_string()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Oct 2011 17:30:10 +0000 (19:30 +0200)]
prores: use C idct for fate as the SSE code is not matching the SSE* code down at the bits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Oct 2011 12:04:29 +0000 (14:04 +0200)]
fate: enable the prores tests
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Oct 2011 01:43:24 +0000 (03:43 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
prores: add FATE tests
id3v2: reduce the scope of some non-globally-used symbols/structures
id3v2: cosmetics: move some declarations before the places they are used
shorten: remove the flush function.
shn: do not allow seeking in the raw shn demuxer.
avformat: add AVInputFormat flag AVFMT_NO_BYTE_SEEK.
avformat: update AVInputFormat allowed flags
avformat: don't unconditionally call ff_read_frame_flush() when trying to seek.
truespeech: use sizeof() instead of hardcoded sizes
truespeech: remove unneeded variable, 'consumed'
truespeech: simplify truespeech_read_frame() by using get_bits()
truespeech: decode directly to output buffer instead of a temp buffer
truespeech: check to make sure channels == 1
truespeech: check for large enough output buffer rather than truncating output
truespeech: remove unneeded zero-size packet check.
mlpdec: return meaningful error codes instead of -1
mlpdec: remove unnecessary wrapper function
mlpdec: only calculate output size once
mlpdec: validate that the reported channel count matches the actual output channel count
pcm: reduce pointer type casting
...
Conflicts:
libavformat/avformat.h
libavformat/id3v2.c
libavformat/id3v2.h
libavformat/utils.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Oct 2011 00:14:09 +0000 (02:14 +0200)]
cmdutils.h: Project name cleanup
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 14 Oct 2011 00:13:46 +0000 (02:13 +0200)]
cmdutils: Fix loglevel for -debug
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Oct 2011 23:45:13 +0000 (01:45 +0200)]
proresdec: set CODEC_CAP_DR1, it appears this was forgotten.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Oct 2011 19:59:04 +0000 (21:59 +0200)]
opt: handle AV_OPT_TYPE_CONST too
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 23 Sep 2011 00:06:23 +0000 (02:06 +0200)]
prores: add FATE tests
Diego Biurrun [Mon, 10 Oct 2011 13:51:02 +0000 (15:51 +0200)]
id3v2: reduce the scope of some non-globally-used symbols/structures
Diego Biurrun [Mon, 10 Oct 2011 13:48:59 +0000 (15:48 +0200)]
id3v2: cosmetics: move some declarations before the places they are used
Justin Ruggles [Sat, 17 Sep 2011 02:21:47 +0000 (22:21 -0400)]
shorten: remove the flush function.
The shorten decoder does not support seeking.
Justin Ruggles [Sun, 2 Oct 2011 16:03:22 +0000 (12:03 -0400)]
shn: do not allow seeking in the raw shn demuxer.
The demuxer does not read the seektable, a parser is not possible without a
full decode, and no shorten decoder can handle random seeking because it needs
side info from the seektable.
Justin Ruggles [Sun, 2 Oct 2011 15:57:53 +0000 (11:57 -0400)]
avformat: add AVInputFormat flag AVFMT_NO_BYTE_SEEK.
This will prevent seeking by bytes for formats that cannot handle this.
Justin Ruggles [Sun, 2 Oct 2011 15:29:20 +0000 (11:29 -0400)]
avformat: update AVInputFormat allowed flags
Justin Ruggles [Fri, 16 Sep 2011 23:02:23 +0000 (19:02 -0400)]
avformat: don't unconditionally call ff_read_frame_flush() when trying to seek.
This prevents flushing the packet buffer when the input format does not
support seeking.
Justin Ruggles [Thu, 13 Oct 2011 18:03:17 +0000 (14:03 -0400)]
truespeech: use sizeof() instead of hardcoded sizes
Justin Ruggles [Thu, 13 Oct 2011 04:21:17 +0000 (00:21 -0400)]
truespeech: remove unneeded variable, 'consumed'
increment the 'buf' pointer instead, and consume the whole packet.
Justin Ruggles [Thu, 13 Oct 2011 04:17:05 +0000 (00:17 -0400)]
truespeech: simplify truespeech_read_frame() by using get_bits()
Justin Ruggles [Thu, 13 Oct 2011 03:27:32 +0000 (23:27 -0400)]
truespeech: decode directly to output buffer instead of a temp buffer
Justin Ruggles [Thu, 13 Oct 2011 03:23:18 +0000 (23:23 -0400)]
truespeech: check to make sure channels == 1
Justin Ruggles [Thu, 13 Oct 2011 03:15:00 +0000 (23:15 -0400)]
truespeech: check for large enough output buffer rather than truncating output
Justin Ruggles [Thu, 13 Oct 2011 03:10:41 +0000 (23:10 -0400)]
truespeech: remove unneeded zero-size packet check.
This is already checked in avcodec_decode_audio3()
Justin Ruggles [Thu, 13 Oct 2011 02:47:50 +0000 (22:47 -0400)]
mlpdec: return meaningful error codes instead of -1
Justin Ruggles [Thu, 13 Oct 2011 02:37:12 +0000 (22:37 -0400)]
mlpdec: remove unnecessary wrapper function
Justin Ruggles [Wed, 21 Sep 2011 16:14:28 +0000 (12:14 -0400)]
mlpdec: only calculate output size once
Justin Ruggles [Thu, 13 Oct 2011 02:30:44 +0000 (22:30 -0400)]
mlpdec: validate that the reported channel count matches the actual output
channel count
Reimar Döffinger [Thu, 13 Oct 2011 17:45:49 +0000 (19:45 +0200)]
Improve PVA probe function.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Mans Rullgard [Sat, 8 Oct 2011 11:47:53 +0000 (12:47 +0100)]
pcm: reduce pointer type casting
Making 'samples' a pointer to uint8_t simplifies the DECODE
macro and reduces the amount of type casting overall.
This also fixes some signed overflows on left shift.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Nicolas George [Thu, 13 Oct 2011 15:54:11 +0000 (17:54 +0200)]
libmodplug: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 15:54:10 +0000 (17:54 +0200)]
vsrc_nullsrc: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 15:54:01 +0000 (17:54 +0200)]
vf_crop: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 15:54:09 +0000 (17:54 +0200)]
vf_settb: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 15:54:08 +0000 (17:54 +0200)]
vf_setpts: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 15:54:07 +0000 (17:54 +0200)]
vf_select: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 15:54:06 +0000 (17:54 +0200)]
vf_scale: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 15:54:05 +0000 (17:54 +0200)]
vf_pad: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 15:54:04 +0000 (17:54 +0200)]
vf_overlay: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 15:54:03 +0000 (17:54 +0200)]
vf_lut: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 15:54:02 +0000 (17:54 +0200)]
vf_drawtext: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Oct 2011 15:54:22 +0000 (17:54 +0200)]
Merge remote-tracking branch 'hexene/stagefright'
* hexene/stagefright:
tools/build_libstagefright: fetch android system headers and libraries
libstagefright: reindent after previous commit
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Thu, 13 Oct 2011 11:24:24 +0000 (13:24 +0200)]
eval: add mathematical constants (PI, E, PHI).
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mohamed Naufal [Thu, 13 Oct 2011 10:18:51 +0000 (15:48 +0530)]
g723.1: use raw muxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Sun, 9 Oct 2011 11:57:08 +0000 (12:57 +0100)]
mathops: remove undefined behaviour from sign_extend()
This function intentionally overflows the signed range on
the left shift. Using this type-punning avoids errors from
the overflow checker without disabling this test globally.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Kostya Shishkov [Thu, 13 Oct 2011 08:12:42 +0000 (10:12 +0200)]
vc1: explicitly zero interlaced mode coding variables for progressive mode
Both v->fcm and v->field_mode are used in common code, now they won't be
reset for progressive frame after interlaced one causing writing past the
frame end for example.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Michael Niedermayer [Thu, 13 Oct 2011 02:55:40 +0000 (04:55 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (31 commits)
tiffenc: initialize forgotten avctx.
avplay: free the active audio packet at exit.
avplay: free rdft data used for spectrogram analysis.
log.h: make AVClass a named struct
fix ac3 encoder documentation
vc1: more prettyprinting cosmetics
vc1: prettyprint some tables
vc1: K&R formatting cosmetics
AVOptions: bump minor and add APIchanges entry.
cmdutils/avtools: simplify show_help() by using av_opt_child_class_next()
AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*
Remove all uses of deprecated AVOptions API.
AVOptions: add av_opt_next, deprecate av_next_option.
AVOptions: add functions for evaluating option strings.
AVOptions: split get_number().
AVOptions: add av_opt_get*, deprecate av_get*.
AVOptions: add av_opt_set*().
AVOptions: add new API for enumerating children.
rv34: move inverse transform functions to DSP context
flvenc: Write the right metadata entry count
...
Conflicts:
avconv.c
cmdutils.c
doc/APIchanges
ffplay.c
ffprobe.c
libavcodec/ac3dec.c
libavcodec/h264.c
libavcodec/libvpxenc.c
libavcodec/libx264.c
libavcodec/mpeg12enc.c
libavcodec/options.c
libavdevice/libdc1394.c
libavdevice/v4l2.c
libavfilter/vf_drawtext.c
libavformat/flvdec.c
libavformat/mpegtsenc.c
libavformat/options.c
libavutil/avutil.h
libavutil/opt.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
John Brooks [Wed, 12 Oct 2011 06:53:12 +0000 (00:53 -0600)]
Correct buffer handling for RTCP packets
Previous code could read 4 bytes past the end of the buffer on a RTCP_SR
packet or offset a pointer by an unchecked external value (payload_len),
though neither will reliably cause a crash or other misbehavior beyond
garbage timestamps.
Additionally, unknown RTCP packet types, even in compounded packets, are
now ignored as per RFC 3550 section 6.1, page 22, though currently this
only has any practical effect if a sender puts an unrecognized type
before RTCP_BYE in a compounded packet, or (incorrectly) does not put
RTCP_SR first.
Signed-off-by: John Brooks <john.brooks@bluecherry.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean First [Fri, 23 Sep 2011 21:39:51 +0000 (23:39 +0200)]
tiffenc: initialize forgotten avctx.
Justin Ruggles [Wed, 12 Oct 2011 18:44:02 +0000 (14:44 -0400)]
avplay: free the active audio packet at exit.
fixes a memleak
Justin Ruggles [Wed, 12 Oct 2011 18:38:02 +0000 (14:38 -0400)]
avplay: free rdft data used for spectrogram analysis.
fixes a memleak
Jindrich Makovicka [Wed, 12 Oct 2011 20:30:56 +0000 (22:30 +0200)]
log.h: make AVClass a named struct
'struct AVClass' is used in the code since
641c7afe3c17334b81e3e2eef88f1751eb68f89f, but AVClass is typedeffed as
an anonymous struct.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Wed, 12 Oct 2011 20:18:35 +0000 (22:18 +0200)]
proresdsp: fix rounding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Oct 2011 20:09:40 +0000 (22:09 +0200)]
proresdsp: Correct credits to point to the Author and not just the code this is based on.
Also change Libav to FFmpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Oct 2011 20:02:54 +0000 (22:02 +0200)]
dct-test: Test ff_prores_idct_put_10_sse2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Oct 2011 20:01:44 +0000 (22:01 +0200)]
dct-test: add transpose permutation support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Oct 2011 19:59:44 +0000 (21:59 +0200)]
proresdsp: Optimize series of padds out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Oct 2011 19:46:35 +0000 (21:46 +0200)]
proresdsp.asm: Remove useless instructions.
Justin Ruggles [Tue, 11 Oct 2011 19:04:33 +0000 (15:04 -0400)]
fix ac3 encoder documentation
some of the mode values were reversed
Elvis Presley [Wed, 12 Oct 2011 17:10:22 +0000 (19:10 +0200)]
prores: change license to LGPL, merge some parts.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Elvis Presley [Wed, 12 Oct 2011 16:19:45 +0000 (18:19 +0200)]
proresdsp.asm: drop useless shifts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Elvis Presley [Wed, 12 Oct 2011 16:07:20 +0000 (18:07 +0200)]
x86/proresdsp-init: add forgotten HAVE_YASM
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Elvis Presley [Wed, 12 Oct 2011 14:12:22 +0000 (16:12 +0200)]
configure: drop GPLv2 support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kostya Shishkov [Tue, 11 Oct 2011 09:59:57 +0000 (11:59 +0200)]
vc1: more prettyprinting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Kostya Shishkov [Tue, 11 Oct 2011 10:01:04 +0000 (12:01 +0200)]
vc1: prettyprint some tables
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Kostya Shishkov [Tue, 11 Oct 2011 10:00:18 +0000 (12:00 +0200)]
vc1: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Anton Khirnov [Tue, 4 Oct 2011 06:13:40 +0000 (08:13 +0200)]
AVOptions: bump minor and add APIchanges entry.
Anton Khirnov [Tue, 4 Oct 2011 12:50:00 +0000 (14:50 +0200)]
cmdutils/avtools: simplify show_help() by using av_opt_child_class_next()
Anton Khirnov [Tue, 4 Oct 2011 05:38:01 +0000 (07:38 +0200)]
AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*
Anton Khirnov [Mon, 3 Oct 2011 19:10:06 +0000 (21:10 +0200)]
Remove all uses of deprecated AVOptions API.
Anton Khirnov [Mon, 3 Oct 2011 18:04:07 +0000 (20:04 +0200)]
AVOptions: add av_opt_next, deprecate av_next_option.
Just for naming consistency, no functional changes.
Anton Khirnov [Tue, 23 Aug 2011 13:02:25 +0000 (15:02 +0200)]
AVOptions: add functions for evaluating option strings.
Anton Khirnov [Tue, 23 Aug 2011 12:25:56 +0000 (14:25 +0200)]
AVOptions: split get_number().
Split actual writing to read_number() in the same way as write_number().
Allows set_string_number() to write to a caller-provided destination.
Anton Khirnov [Mon, 5 Sep 2011 19:37:02 +0000 (21:37 +0200)]
AVOptions: add av_opt_get*, deprecate av_get*.
New functions can get values from child objects, properly report error
codes and have consistent naming and signatures.
Anton Khirnov [Mon, 5 Sep 2011 06:15:32 +0000 (08:15 +0200)]
AVOptions: add av_opt_set*().
Deprecate av_set_*
New functions support setting values on children, return error codes
instead of options and have consistent naming and signatures.
Anton Khirnov [Mon, 3 Oct 2011 17:49:12 +0000 (19:49 +0200)]
AVOptions: add new API for enumerating children.
This will allow the caller to enumerate child contexts in a generic way
and since the API is recursive, it also allows for deeper nesting (e.g.
AVFormatContext->AVIOContext->URLContext)
This will also allow the new setting/reading API to transparently apply
to children contexts.
Janne Grunau [Sat, 24 Sep 2011 10:54:28 +0000 (12:54 +0200)]
rv34: move inverse transform functions to DSP context
Clément Bœsch [Tue, 11 Oct 2011 14:04:34 +0000 (16:04 +0200)]
doc: small ascii diagram on I/O files and streams in ffmpeg.c
Stefano Sabatini [Wed, 12 Oct 2011 12:53:56 +0000 (14:53 +0200)]
ffprobe: show sample_fmt in the stream section
Martin Storsjö [Wed, 21 Sep 2011 13:58:07 +0000 (16:58 +0300)]
flvenc: Write the right metadata entry count
No application rely on this count being correct as far as
I know, but if we write a nonzero count value, it might just
as well be the right one.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 27 Dec 2010 07:51:09 +0000 (09:51 +0200)]
rtsp: Request that dynamic rate is disabled
DSS enables this automatically if streaming VOD over TCP. If
enabled, the server feeds packets faster than realtime, screwing
up RTCP NTP based timestamps.
Also, DSS doesn't indicate that this was indicated, if it was
enabled automatically (although if it was requested to be enabled,
a header saying that it was enabled is added, but this isn't
added if it is enabled automatically), making it even harder
to detect and work around properly without explicitly asking
for it to be disabled(/enabled, if we were able to support it).
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 2 Jan 2011 12:32:18 +0000 (14:32 +0200)]
rtsp: Parse the x-Accept-Dynamic-Rate header
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 12 Oct 2011 09:37:42 +0000 (12:37 +0300)]
rtpdec: Add ff_ prefix to all nonstatic symbols
Signed-off-by: Martin Storsjö <martin@martin.st>
Mans Rullgard [Wed, 12 Oct 2011 11:25:10 +0000 (12:25 +0100)]
h264: change unsupported bit depth message to error level
Unsupported bit depth is certainly an error the user will
want to know about.
Signed-off-by: Mans Rullgard <mans@mansr.com>
John Brooks [Wed, 12 Oct 2011 06:53:12 +0000 (00:53 -0600)]
rtpdec: Read the packet length for all RTCP packet types
This allows skipping past unsupported RTCP packet types, as
RFC 3550 section 6.1 mandates.
Currently this only has any practical effect if a sender puts
an unrecognized type before RTCP_BYE in a compounded packet, or
(incorrectly) does not put RTCP_SR first.
Signed-off-by: Martin Storsjö <martin@martin.st>
John Brooks [Wed, 12 Oct 2011 08:06:26 +0000 (11:06 +0300)]
rtpdec: Fix the minimum packet length for RTCP SR packets
We actually read 20 bytes of these packets.
Signed-off-by: Martin Storsjö <martin@martin.st>
Mans Rullgard [Tue, 11 Oct 2011 16:45:55 +0000 (17:45 +0100)]
qdm2: fix signed multiplication overflow
This code relies on the result wrapping as for unsigned
values, and the sign is not used. Thus an unsigned type
is proper here.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Martin Storsjö [Tue, 11 Oct 2011 21:03:20 +0000 (00:03 +0300)]
flvdec: Don't export metadata entries that aren't proper metadata
This avoids writing these entries doubly if transcoding from
flv to flv, since the muxer blindly writes any and all metadata
keys set, in addition to the fixed fields that the muxer
always writes.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Oct 2011 20:56:39 +0000 (23:56 +0300)]
flvdec: Split out setting of numeric fields from storing metadata
Signed-off-by: Martin Storsjö <martin@martin.st>
Anton Khirnov [Sun, 9 Oct 2011 17:34:20 +0000 (19:34 +0200)]
libx264: support yuv422/444 output.
Anton Khirnov [Sun, 9 Oct 2011 17:33:30 +0000 (19:33 +0200)]
sws: support yuv444p9/10 output.
Michael Niedermayer [Wed, 12 Oct 2011 03:33:52 +0000 (05:33 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (23 commits)
fix AC3ENC_OPT_MODE_ON/OFF
h264: fix HRD parameters parsing
prores: implement multithreading.
prores: idct sse2/sse4 optimizations.
swscale: use aligned move for storage into temporary buffer.
prores: extract idct into its own dspcontext and merge with put_pixels.
h264: fix invalid shifts in init_cavlc_level_tab()
intfloat_readwrite: fix signed addition overflows
mov: do not misreport empty stts
mov: cosmetics, fix for and if spacing
id3v2: fix NULL pointer dereference
mov: read album_artist atom
mov: fix disc/track numbers and totals
doc: fix references to obsolete presets directories for avconv/ffmpeg
flashsv: return more meaningful error value
flashsv: fix typo in av_log() message
smacker: validate channels and sample format.
smacker: check buffer size before reading output size
smacker: validate number of channels
smacker: Separate audio flags from sample rates in smacker demuxer.
...
Conflicts:
cmdutils.h
doc/ffmpeg.texi
libavcodec/Makefile
libavcodec/motion_est_template.c
libavformat/id3v2.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Oct 2011 01:39:57 +0000 (03:39 +0200)]
cdg: enable seeking
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Oct 2011 01:38:39 +0000 (03:38 +0200)]
cdg: Try to detect keyframes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Oct 2011 01:38:08 +0000 (03:38 +0200)]
cdg: set timestamps
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Oct 2011 23:04:12 +0000 (01:04 +0200)]
lavf: check stream_index from read_packet() for validity.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Daniel Kristjansson [Tue, 11 Oct 2011 22:47:43 +0000 (00:47 +0200)]
pcm: Print number of bits in the error message of unsupported DVD PCM formats.
Michael Niedermayer [Tue, 11 Oct 2011 20:13:02 +0000 (22:13 +0200)]
examples/encoding: rename to decoding_encoding.c as the file is an example for both.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Oct 2011 20:10:26 +0000 (22:10 +0200)]
examples/encoding: List more formats to make it more clear to the reader what is not handled in libavcodec.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Oct 2011 20:03:19 +0000 (22:03 +0200)]
mem: fix memalign hack av_realloc()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
John Stebbins [Tue, 11 Oct 2011 18:57:58 +0000 (14:57 -0400)]
fix AC3ENC_OPT_MODE_ON/OFF
The values were reversed.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>