]> git.sesse.net Git - ffmpeg/log
ffmpeg
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 24 Sep 2011 20:37:24 +0000 (22:37 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  flvdec: Fix invalid pointer deferences when parsing index
  configure: disable hardware capabilities ELF section with suncc on Solaris x86
  Use explicit struct initializers for AVCodec declarations.
  Use explicit struct initializers for AVOutputFormat/AVInputFormat declarations.
  adpcmenc: Set bits_per_coded_sample
  adpcmenc: fix QT IMA ADPCM encoder
  adpcmdec: Fix QT IMA ADPCM decoder
  permit decoding of multichannel ADPCM_EA_XAS
  Fix input buffer size check in adpcm_ea decoder.
  fft: avoid a signed overflow
  mpegps: Handle buffer exhaustion when reading packets.

Conflicts:
libavcodec/adpcm.c
libavcodec/adpcmenc.c
libavdevice/alsa-audio-enc.c
libavformat/flvdec.c
libavformat/mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoAdd .bit (de)muxer
Vladimir Voroshilov [Sat, 24 Sep 2011 20:08:16 +0000 (22:08 +0200)]
Add .bit (de)muxer

12 years agoFix segfault in save_bits:
Sascha Sommer [Sat, 24 Sep 2011 18:56:41 +0000 (20:56 +0200)]
Fix segfault in save_bits:
use put_bits_count to get the buffer fill state instead of
num_saved_bits as num_saved_bits is sometimes reset when
frames are lost
(Ticket 495)

12 years agog729dec: disable all cpu acceleration, the code does not provide any alignment.
Michael Niedermayer [Sat, 24 Sep 2011 18:56:01 +0000 (20:56 +0200)]
g729dec: disable all cpu acceleration, the code does not provide any alignment.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agog729dec: set sample format.
Michael Niedermayer [Sat, 24 Sep 2011 18:55:41 +0000 (20:55 +0200)]
g729dec: set sample format.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoDisable MMX
Vladimir Voroshilov [Thu, 18 Jun 2009 01:16:03 +0000 (08:16 +0700)]
Disable MMX

12 years agoFix comments about implemented codecs
Vladimir Voroshilov [Wed, 3 Sep 2008 06:08:04 +0000 (13:08 +0700)]
Fix comments about implemented codecs

12 years agoG.729 .bit file demuxer
Vladimir Voroshilov [Wed, 3 Sep 2008 08:18:40 +0000 (15:18 +0700)]
G.729 .bit file demuxer

12 years agoact: remove AVERROR_NOFMT useage.
Michael Niedermayer [Sat, 24 Sep 2011 18:05:13 +0000 (20:05 +0200)]
act: remove AVERROR_NOFMT useage.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoACT demuxer
Vladimir Voroshilov [Wed, 3 Jun 2009 18:43:53 +0000 (01:43 +0700)]
ACT demuxer

12 years agoAdaptive gain control
Vladimir Voroshilov [Sun, 28 Jun 2009 14:01:23 +0000 (21:01 +0700)]
Adaptive gain control

12 years agoG.729 postfilter
Vladimir Voroshilov [Wed, 3 Sep 2008 08:55:53 +0000 (15:55 +0700)]
G.729 postfilter

12 years agoReplace pitch_delay_int with array
Vladimir Voroshilov [Fri, 26 Jun 2009 02:26:56 +0000 (09:26 +0700)]
Replace pitch_delay_int with array

12 years agoG.729 build environment
Vladimir Voroshilov [Wed, 3 Sep 2008 08:39:41 +0000 (15:39 +0700)]
G.729 build environment

12 years agog729dec: Make 2 functions static that are not used outside g729dec.c
Michael Niedermayer [Sat, 24 Sep 2011 17:52:19 +0000 (19:52 +0200)]
g729dec: Make 2 functions static that are not used outside g729dec.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoHigh-pass filter
Vladimir Voroshilov [Thu, 4 Jun 2009 19:05:57 +0000 (02:05 +0700)]
High-pass filter

12 years agoAdd G.729D decoder
Vladimir Voroshilov [Wed, 3 Sep 2008 16:47:58 +0000 (23:47 +0700)]
Add G.729D decoder

12 years agoSynthesis filter
Vladimir Voroshilov [Fri, 5 Jun 2009 04:11:54 +0000 (11:11 +0700)]
Synthesis filter

12 years agoIndentation fix after gain codes decoding2
Vladimir Voroshilov [Fri, 12 Jun 2009 17:28:13 +0000 (00:28 +0700)]
Indentation fix after gain codes decoding2

12 years agoGain pitch and gain code for G729D
Vladimir Voroshilov [Fri, 12 Jun 2009 17:32:54 +0000 (00:32 +0700)]
Gain pitch and gain code for G729D

12 years agoIndentation fix 2
Vladimir Voroshilov [Fri, 26 Jun 2009 19:16:31 +0000 (02:16 +0700)]
Indentation fix 2

12 years agoConvert gain pitch and gain code to arrays
Vladimir Voroshilov [Fri, 12 Jun 2009 16:55:06 +0000 (23:55 +0700)]
Convert gain pitch and gain code to arrays

12 years agoInterolate excitation signal
Vladimir Voroshilov [Thu, 4 Jun 2009 19:12:31 +0000 (02:12 +0700)]
Interolate excitation signal

12 years agoFixed- and adaptive-codebook gains
Vladimir Voroshilov [Thu, 4 Jun 2009 18:55:06 +0000 (01:55 +0700)]
Fixed- and adaptive-codebook gains

12 years agoFrame erasure support for fixed-codebook vectors
Vladimir Voroshilov [Fri, 5 Jun 2009 03:35:11 +0000 (10:35 +0700)]
Frame erasure support for fixed-codebook vectors

12 years agoFixed-codebook vector decoding
Vladimir Voroshilov [Thu, 4 Jun 2009 18:43:22 +0000 (01:43 +0700)]
Fixed-codebook vector decoding

12 years agoAdd packet_type
Vladimir Voroshilov [Fri, 12 Jun 2009 17:24:23 +0000 (00:24 +0700)]
Add packet_type

12 years agoFrame erasure support for pitch delay decoding
Vladimir Voroshilov [Thu, 11 Jun 2009 06:51:28 +0000 (13:51 +0700)]
Frame erasure support for pitch delay decoding

12 years agoDoxy for LSF erasure case
Vladimir Voroshilov [Wed, 24 Jun 2009 05:09:20 +0000 (12:09 +0700)]
Doxy for LSF erasure case

12 years agodoxy comments for LSF array
Vladimir Voroshilov [Tue, 23 Jun 2009 05:39:33 +0000 (12:39 +0700)]
doxy comments for LSF array

12 years agoIndentation fix in LSF
Vladimir Voroshilov [Fri, 12 Jun 2009 17:06:13 +0000 (00:06 +0700)]
Indentation fix in LSF

12 years agoFrame erasure support for LSF decoding
Vladimir Voroshilov [Thu, 11 Jun 2009 05:30:46 +0000 (12:30 +0700)]
Frame erasure support for LSF decoding

12 years agoRevert "g729: Merge g729.h into g729dec.c."
Michael Niedermayer [Sat, 24 Sep 2011 17:41:47 +0000 (19:41 +0200)]
Revert "g729: Merge g729.h into g729dec.c."

This reverts commit a2077b85da5bf71167b11925aabbb738558a134d.

12 years agoRestore WIP g729 code that has been remvoed by diego biurrun.
Michael Niedermayer [Sat, 24 Sep 2011 17:39:18 +0000 (19:39 +0200)]
Restore WIP g729 code that has been remvoed by diego biurrun.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agovp56:Fix error recovery code on size changes in vp5/6 decoder
Laurent Aimar [Sat, 24 Sep 2011 14:16:40 +0000 (16:16 +0200)]
vp56:Fix error recovery code on size changes in vp5/6 decoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agovp6:Reset the internal state when aborting key frames header parsing in vp6 decoder.
Laurent Aimar [Sat, 24 Sep 2011 14:19:25 +0000 (16:19 +0200)]
vp6:Reset the internal state when aborting key frames header parsing in vp6 decoder.
It prevents leaving the state only half initialized.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoflvdec: Fix invalid pointer deferences when parsing index
Laurent Aimar [Sat, 24 Sep 2011 14:16:38 +0000 (16:16 +0200)]
flvdec: Fix invalid pointer deferences when parsing index

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoh264: Check for out of bounds reads in ff_h264_decode_extradata().
Laurent Aimar [Sat, 24 Sep 2011 14:44:14 +0000 (16:44 +0200)]
h264: Check for out of bounds reads in ff_h264_decode_extradata().

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoconfigure: disable hardware capabilities ELF section with suncc on Solaris x86
Sean McGovern [Sat, 17 Sep 2011 04:36:37 +0000 (00:36 -0400)]
configure: disable hardware capabilities ELF section with suncc on Solaris x86

When using suncc to build, the Solaris linker will mark
an executable with each instruction set encountered by
the Solaris assembler.  As our libraries contain their own
guards for processor-specific code, instead suppress
generation of the HWCAPS ELF section on Solaris x86 only.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
12 years agovf_drawtext: use ctx for expressing outlink and dtext in end_frame
Stefano Sabatini [Fri, 23 Sep 2011 12:28:26 +0000 (14:28 +0200)]
vf_drawtext: use ctx for expressing outlink and dtext in end_frame

(Very) slighly improve readability.

12 years agovf_drawtext: perform misc cosmetics changes to uninit
Stefano Sabatini [Fri, 23 Sep 2011 12:13:47 +0000 (14:13 +0200)]
vf_drawtext: perform misc cosmetics changes to uninit

In particular:
* lexically sort strings freeing commands
* logically group freeing instructions
* prefer NULL over 0 when setting dtext->glyphs

12 years agovf_drawtext: set string defaults in the options array
Stefano Sabatini [Fri, 23 Sep 2011 12:02:16 +0000 (14:02 +0200)]
vf_drawtext: set string defaults in the options array

Simplify.

12 years agovf_drawtext: make x and y options parametric
Stefano Sabatini [Sun, 18 Sep 2011 00:41:56 +0000 (02:41 +0200)]
vf_drawtext: make x and y options parametric

Address trac issue #378.

12 years agovf_drawtext: drop text wrapping feature
Stefano Sabatini [Sun, 18 Sep 2011 00:51:17 +0000 (02:51 +0200)]
vf_drawtext: drop text wrapping feature

Or in other word, do not go to the next line when the text cannot be
rendered within the frame.

The rationale is that wrapping is hard to manage, as it depends on the
position of the text, thus making hard/impossible to compute the size
occupied by the rendered text, and makes the filter behavior
unpredictible with moving text (implemented in a pending patch).

Also the current wrapping code is very limited (for example it splits
words in the middle), and correctly handling wrapping requires much
more complexity (alignment, gravity, word parsing etc.), while
drawtext is meant to be only a thin wrapper around libfreetype, so
such advanced features don't belong here.

12 years agovf_drawtext: fix missed update in docs
Stefano Sabatini [Fri, 23 Sep 2011 11:54:43 +0000 (13:54 +0200)]
vf_drawtext: fix missed update in docs

12 years agoUse explicit struct initializers for AVCodec declarations.
Diego Biurrun [Fri, 23 Sep 2011 19:11:15 +0000 (21:11 +0200)]
Use explicit struct initializers for AVCodec declarations.

12 years agoUse explicit struct initializers for AVOutputFormat/AVInputFormat declarations.
Diego Biurrun [Fri, 23 Sep 2011 18:50:11 +0000 (20:50 +0200)]
Use explicit struct initializers for AVOutputFormat/AVInputFormat declarations.

12 years agoAdd new pix_fmt RGBA64
Jean First [Fri, 23 Sep 2011 18:26:20 +0000 (20:26 +0200)]
Add new pix_fmt RGBA64

12 years agoffplay: fix order of operations for sdl audio open.
Michael Niedermayer [Sat, 24 Sep 2011 01:09:54 +0000 (03:09 +0200)]
ffplay: fix order of operations for sdl audio open.
Fixes Ticket149

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoadpcmenc: Set bits_per_coded_sample
Justin Ruggles [Thu, 8 Sep 2011 02:52:06 +0000 (22:52 -0400)]
adpcmenc: Set bits_per_coded_sample

12 years agoadpcmenc: fix QT IMA ADPCM encoder
Baptiste Coudurier [Thu, 8 Sep 2011 02:27:03 +0000 (22:27 -0400)]
adpcmenc: fix QT IMA ADPCM encoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoadpcmdec: Fix QT IMA ADPCM decoder
Baptiste Coudurier [Sun, 8 May 2011 11:13:17 +0000 (13:13 +0200)]
adpcmdec: Fix QT IMA ADPCM decoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agopermit decoding of multichannel ADPCM_EA_XAS
Peter Ross [Sat, 23 Apr 2011 12:08:48 +0000 (22:08 +1000)]
permit decoding of multichannel ADPCM_EA_XAS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoFix input buffer size check in adpcm_ea decoder.
Reimar Döffinger [Thu, 8 Sep 2011 02:14:07 +0000 (22:14 -0400)]
Fix input buffer size check in adpcm_ea decoder.

Unfortunately the output buffer size check assumes that the
input buffer is never over-consumed, thus this actually
also allowed to write outside the output buffer if "lucky".

Based on:
git.videolan.org/ffmpeg.git
commit 701d0eb185192542c4a17f296e39e37cedf7abc6

12 years agofft: avoid a signed overflow
Sean McGovern [Tue, 20 Sep 2011 01:32:09 +0000 (21:32 -0400)]
fft: avoid a signed overflow

As a signed integer, 1<<31 overflows, so force it to unsigned.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
12 years agopostproc: fix compilation failure, now really
Michael Niedermayer [Fri, 23 Sep 2011 23:51:35 +0000 (01:51 +0200)]
postproc: fix compilation failure, now really
forgot git add ...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agopostproc: Fix compilation failure.
Yuriy Kaminskiy [Fri, 23 Sep 2011 23:33:37 +0000 (01:33 +0200)]
postproc: Fix compilation failure.

libpostproc/postprocess_template.c: In function 'dering_MMX2':
libpostproc/postprocess_template.c:1045:5: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'
libpostproc/postprocess_template.c:1045:5: error: 'asm' operand has impossible constraints

12 years agompegps: Handle buffer exhaustion when reading packets.
Alex Converse [Fri, 23 Sep 2011 23:28:23 +0000 (16:28 -0700)]
mpegps: Handle buffer exhaustion when reading packets.

12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 23 Sep 2011 22:54:59 +0000 (00:54 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtp: factorize  dynamic payload type fallback
  flvdec: Ignore the index if it's from a creator known to be different
  cmdutils: move grow_array out of #if CONFIG_AVFILTER
  avconv: actually set InputFile.rate_emu
  ratecontrol: update last_qscale_for sooner
  Fix unnecessary shift with 9/10bit vertical scaling
  prores: mark prores as intra-only in libavformat/utils.c:is_intra_only()
  prores: return more meaningful error values
  prores: improve error message wording
  prores: cosmetics: prettyprinting, drop useless parentheses
  prores: lowercase AVCodec name entry

Conflicts:
cmdutils.c
libavcodec/proresdec_lgpl.c
tests/ref/lavfi/pixfmts_scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agotiffenc: initialize forgotten avctx.
Jean First [Fri, 23 Sep 2011 21:39:51 +0000 (23:39 +0200)]
tiffenc: initialize forgotten avctx.

12 years agotiffenc: Add forgotten avclass to context.
Jean First [Fri, 23 Sep 2011 21:39:26 +0000 (23:39 +0200)]
tiffenc: Add forgotten avclass to context.

12 years agoaacdec: fix channel reconfigs on LATM
Michael Niedermayer [Fri, 23 Sep 2011 20:41:10 +0000 (22:41 +0200)]
aacdec: fix channel reconfigs on LATM
Fixes Ticket200

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoaacdec: Make aac-latm closer to the spec (not reading random data leading to random...
Michael Niedermayer [Fri, 23 Sep 2011 20:34:26 +0000 (22:34 +0200)]
aacdec: Make aac-latm closer to the spec (not reading random data leading to random false configurations)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoaacsbr: prevent multiple ff_aac_sbr_ctx_init()
Michael Niedermayer [Fri, 23 Sep 2011 20:31:57 +0000 (22:31 +0200)]
aacsbr: prevent multiple ff_aac_sbr_ctx_init()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoaacsbr: add a assert0 to check for a inconsistency that
Michael Niedermayer [Fri, 23 Sep 2011 20:30:27 +0000 (22:30 +0200)]
aacsbr: add a assert0 to check for a inconsistency that
occurd during debug. I dont know if this can happen normally but if so
it would be quite bad.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agortp: factorize dynamic payload type fallback
Rafaël Carré [Fri, 23 Sep 2011 19:47:56 +0000 (15:47 -0400)]
rtp: factorize  dynamic payload type fallback

Move the identical code in rtp_write_header() and
ff_sdp_write_media() inside ff_rtp_get_payload_type()

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years agoflvdec: Ignore the index if it's from a creator known to be different
Martin Storsjö [Wed, 21 Sep 2011 13:51:13 +0000 (16:51 +0300)]
flvdec: Ignore the index if it's from a creator known to be different

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoMAINTAINERS: loose svn reference
Michael Niedermayer [Fri, 23 Sep 2011 17:18:58 +0000 (19:18 +0200)]
MAINTAINERS: loose svn reference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agopsxstr: improve probe to not misdetect so much.
Michael Niedermayer [Fri, 23 Sep 2011 17:01:12 +0000 (19:01 +0200)]
psxstr: improve probe to not misdetect so much.
The score of 50 can probably be raised if needed
Fixes Ticket490

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMAINTAINERS: update status of 0.6 release
Stefano Sabatini [Fri, 23 Sep 2011 15:52:51 +0000 (17:52 +0200)]
MAINTAINERS: update status of 0.6 release

Its current maintainer is too lazy/busy to actively maintain it.

12 years agocmdutils: move grow_array out of #if CONFIG_AVFILTER
Janne Grunau [Wed, 21 Sep 2011 12:20:20 +0000 (14:20 +0200)]
cmdutils: move grow_array out of #if CONFIG_AVFILTER

fixes programs linking with --disable-avfilter

12 years agoUse a colon in the stream description, this matches how -map works now.
Carl Eugen Hoyos [Fri, 23 Sep 2011 08:16:36 +0000 (10:16 +0200)]
Use a colon in the stream description, this matches how -map works now.

12 years agoavconv: actually set InputFile.rate_emu
Anton Khirnov [Thu, 22 Sep 2011 09:10:00 +0000 (11:10 +0200)]
avconv: actually set InputFile.rate_emu

12 years agoflvdec: Inject in stream extradata, into the stream.
Michael Niedermayer [Fri, 23 Sep 2011 03:45:26 +0000 (05:45 +0200)]
flvdec: Inject in stream extradata, into the stream.
The code before was unsafe, had a race condition and could crash.
This Fixes Ticket499

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoh264dec: Decode in stream avc extradata.
Michael Niedermayer [Fri, 23 Sep 2011 03:43:32 +0000 (05:43 +0200)]
h264dec: Decode in stream avc extradata.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoh264: pass buffer & size to ff_h264_decode_extradata()
Michael Niedermayer [Fri, 23 Sep 2011 03:42:45 +0000 (05:42 +0200)]
h264: pass buffer & size to ff_h264_decode_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMinor documentation clarification regarding AVStream.start_time semantics
Robert Krüger [Thu, 22 Sep 2011 21:20:21 +0000 (23:20 +0200)]
Minor documentation clarification regarding AVStream.start_time semantics

12 years agoaacdec: disable locking code for parse_adts_frame_header() non zero chan config.
Michael Niedermayer [Fri, 23 Sep 2011 00:43:57 +0000 (02:43 +0200)]
aacdec: disable locking code for parse_adts_frame_header() non zero chan config.
This fixes changing channels
It possibly might cause regressions but i cant avoid this without having a test
case that needs the locking code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoratecontrol: update last_qscale_for sooner
Luca Barbato [Fri, 16 Sep 2011 18:06:55 +0000 (20:06 +0200)]
ratecontrol: update last_qscale_for sooner

In order to make ratecontrol converge properly update the
last_qscale_for values when populating the qscale array.

It fixes the issue reported on
http://lists.libav.org/pipermail/libav-tools/2011-September/000050.html

12 years agoFix unnecessary shift with 9/10bit vertical scaling
Kieran Kunhya [Thu, 22 Sep 2011 23:21:05 +0000 (18:21 -0500)]
Fix unnecessary shift with 9/10bit vertical scaling

Signed-off-by: Diego Biurrun <diego@biurrun.de>
12 years agoprores: mark prores as intra-only in libavformat/utils.c:is_intra_only()
Diego Biurrun [Thu, 22 Sep 2011 22:10:29 +0000 (00:10 +0200)]
prores: mark prores as intra-only in libavformat/utils.c:is_intra_only()

12 years agoprores: return more meaningful error values
Diego Biurrun [Thu, 22 Sep 2011 21:51:07 +0000 (23:51 +0200)]
prores: return more meaningful error values

12 years agoprores: improve error message wording
Diego Biurrun [Thu, 22 Sep 2011 21:51:06 +0000 (23:51 +0200)]
prores: improve error message wording

12 years agoprores: cosmetics: prettyprinting, drop useless parentheses
Diego Biurrun [Thu, 22 Sep 2011 21:51:05 +0000 (23:51 +0200)]
prores: cosmetics: prettyprinting, drop useless parentheses

12 years agoprores: lowercase AVCodec name entry
Diego Biurrun [Thu, 22 Sep 2011 21:51:04 +0000 (23:51 +0200)]
prores: lowercase AVCodec name entry

All other codecs use lowercase names in that field.

12 years agovf_drawtext: do not set limitations on fontsize
Stefano Sabatini [Wed, 21 Sep 2011 22:14:54 +0000 (00:14 +0200)]
vf_drawtext: do not set limitations on fontsize

It may be needed to use values greater than 72, and in general greater
than an arbitrary big value. Let the user choose what's too big for
her.

12 years agoforgot git add prores_*c
Michael Niedermayer [Thu, 22 Sep 2011 23:12:29 +0000 (01:12 +0200)]
forgot git add prores_*c
Authorship of the decoders is elvis / maxim. For more details see previous
comits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 22 Sep 2011 22:23:10 +0000 (00:23 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Add LATM demuxer
  avplay: flush audio decoder with empty packets at EOF if the decoder has CODEC_CAP_DELAY set.
  8svx/iff: fix decoding of compressed stereo 8svx files.
  8svx: log an error message if output buffer is too small
  8svx: check packet size before reading the initial sample value.
  8svx: output 8-bit samples instead of 16-bit.
  8svx: split delta decoding into a separate function.
  mp4: Don't read an empty Decoder Config Descriptor
  fate.sh: Ignore errors from rm command during cleanup.
  fate.sh: Run git-pull in quiet mode to avoid console spam.
  Apple ProRes decoder
  rtmp: Make the input FLV parser handle data cut at any point
  rv34: Check for invalid slices offsets
  eval: test isnan(sqrt(-1)) instead of just sqrt(-1)

Conflicts:
Changelog
libavcodec/8svx.c
libavcodec/proresdec.c
libavcodec/version.h
libavformat/iff.c
libavformat/version.h
tests/ref/fate/eval

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomatroskadec: Fix seeking for matroska files with CUES before first cluster
Aaron Colwell [Thu, 22 Sep 2011 14:51:00 +0000 (07:51 -0700)]
matroskadec: Fix seeking for matroska files with CUES before first cluster

This change fixes a bug where seeking doesn't work properly for
matroska files that have the CUES element before the first cluster.
This bug was accidentally introduced a few months ago by my deferred CUES
loading patch<http://git.videolan.org/?p=ffmpeg.git;a=commit;h=31ad14c21e0735387ba8082c6e3436241f7ccfc8>
.

When the CUES element appears before the first cluster in the file, the data
is parsed and placed in matroska->index but that data is never added to the
seek index. Currently the transfer from matroska->index to the seek index
only happens when matroska_parse_cues() is called.
Matroska_parse_cues() only gets called on a seek if cues_parsing_deferred is
set. Cues_parsing_deferred only gets set if parsing the CUES requires
seeking past the first cluster. There is no code to handle the case where
CUES is before the first cluster.

This fix essentially restores the matroska->index processing that was
happening at the end of matroska_read_header() before I made my CUES
deferral change. In the case where CUES is before the first
cluster, matroska->index will have data and the seek index will be updated.
In the case where CUES is later in the file, matroska->index will be empty
and cues_parsing_deferred will be set so loading will happen later.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoAdd LATM demuxer
Janne Grunau [Tue, 6 Sep 2011 20:08:29 +0000 (22:08 +0200)]
Add LATM demuxer

This is a raw demuxer for the AAC LATM decoder and thus limited to
single stream LOAS.

12 years agoavplay: flush audio decoder with empty packets at EOF if the decoder has
Justin Ruggles [Wed, 7 Sep 2011 19:29:53 +0000 (15:29 -0400)]
avplay: flush audio decoder with empty packets at EOF if the decoder has
CODEC_CAP_DELAY set.

12 years ago8svx/iff: fix decoding of compressed stereo 8svx files.
Justin Ruggles [Wed, 7 Sep 2011 19:28:07 +0000 (15:28 -0400)]
8svx/iff: fix decoding of compressed stereo 8svx files.

Make the iff demuxer send the whole audio chunk to the decoder as a
single packet and move stereo interleaving from the iff demuxer to the
decoder.

Based on a patch by Stefano Sabatini.
git.videolan.org/ffmpeg.git
commit e280a4da2ae6fd44f0079358ecc5aa08e388a5ed

12 years ago8svx: log an error message if output buffer is too small
Justin Ruggles [Tue, 6 Sep 2011 22:49:07 +0000 (18:49 -0400)]
8svx: log an error message if output buffer is too small

Based on a patch by Stefano Sabatini.
git.videolan.org/ffmpeg.git
commit e280a4da2ae6fd44f0079358ecc5aa08e388a5ed

12 years ago8svx: check packet size before reading the initial sample value.
Justin Ruggles [Tue, 6 Sep 2011 22:43:55 +0000 (18:43 -0400)]
8svx: check packet size before reading the initial sample value.

12 years ago8svx: output 8-bit samples instead of 16-bit.
Justin Ruggles [Tue, 6 Sep 2011 22:40:06 +0000 (18:40 -0400)]
8svx: output 8-bit samples instead of 16-bit.

Based on a patch by Stefano Sabatini.
git.videolan.org/ffmpeg.git
commit e280a4da2ae6fd44f0079358ecc5aa08e388a5ed

12 years ago8svx: split delta decoding into a separate function.
Justin Ruggles [Tue, 6 Sep 2011 19:13:59 +0000 (15:13 -0400)]
8svx: split delta decoding into a separate function.

Based on a patch by Stefano Sabatini.
git.videolan.org/ffmpeg.git
commit e280a4da2ae6fd44f0079358ecc5aa08e388a5ed

12 years agomp4: Don't read an empty Decoder Config Descriptor
Alex Converse [Wed, 21 Sep 2011 22:26:35 +0000 (15:26 -0700)]
mp4: Don't read an empty Decoder Config Descriptor

12 years agolavf/utils: only complain about aspect missmatch when the difference is "meassureable"
Michael Niedermayer [Thu, 22 Sep 2011 16:17:28 +0000 (18:17 +0200)]
lavf/utils: only complain about aspect missmatch when the difference is "meassureable"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agompeg4videoenc: remove forgotten return -1
Michael Niedermayer [Thu, 22 Sep 2011 16:16:57 +0000 (18:16 +0200)]
mpeg4videoenc: remove forgotten return -1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agofate.sh: Ignore errors from rm command during cleanup.
Diego Biurrun [Tue, 20 Sep 2011 15:09:45 +0000 (17:09 +0200)]
fate.sh: Ignore errors from rm command during cleanup.

The install directory being deleted might not be present if the build failed.
This can lead to annoying error output if the FATE client is run as a cronjob.