ffmpeg.git
9 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>
9 years agotiffenc: initialize forgotten avctx.
Jean First [Fri, 23 Sep 2011 21:39:51 +0000 (23:39 +0200)]
tiffenc: initialize forgotten avctx.

9 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.

9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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.

9 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

9 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.

9 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

9 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>
9 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>
9 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>
9 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

9 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>
9 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

9 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>
9 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()

9 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

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

9 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

9 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.

9 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.

9 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>
9 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>
9 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>
9 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.

9 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.

9 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

9 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

9 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.

9 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

9 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

9 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

9 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>
9 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>
9 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.

9 years agofate.sh: Run git-pull in quiet mode to avoid console spam.
Diego Biurrun [Tue, 20 Sep 2011 15:09:44 +0000 (17:09 +0200)]
fate.sh: Run git-pull in quiet mode to avoid console spam.

Since fate.sh can be run from cron, silent commands are preferrable.

9 years agompeg4videoenc: guess a good aspect when we cant store the exact one.
Michael Niedermayer [Thu, 22 Sep 2011 12:08:39 +0000 (14:08 +0200)]
mpeg4videoenc: guess a good aspect when we cant store the exact one.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoApple ProRes decoder
Maxim Poliakovski [Wed, 21 Sep 2011 11:09:32 +0000 (13:09 +0200)]
Apple ProRes decoder

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoCosmetics: Fix typo.
Carl Eugen Hoyos [Thu, 22 Sep 2011 11:36:33 +0000 (13:36 +0200)]
Cosmetics: Fix typo.

9 years agortmp: Make the input FLV parser handle data cut at any point
Martin Storsjö [Wed, 21 Sep 2011 20:21:30 +0000 (23:21 +0300)]
rtmp: Make the input FLV parser handle data cut at any point

This makes the RTMP writing code able to handle FLV data
fed in arbitrarily small or large chunks, with multiple
consecutive packets in one write call, or having the FLV
packet header split over numerous write calls.

When used in conjunction with the flv muxer, the AVIO buffer
size still needs to be large enough to fit the initial metadata
packet though, since the size of that packet is written with a
seekback.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agorv34: Check for invalid slices offsets
Laurent Aimar [Wed, 21 Sep 2011 18:46:31 +0000 (20:46 +0200)]
rv34: Check for invalid slices offsets

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoeval: test isnan(sqrt(-1)) instead of just sqrt(-1)
Anton Khirnov [Wed, 21 Sep 2011 18:25:19 +0000 (20:25 +0200)]
eval: test isnan(sqrt(-1)) instead of just sqrt(-1)

sqrt(-1) returns "some NaN", it's not specified which exactly.

9 years agopresets: use private options in libx264-ipod ffpresets
Lou Logan [Thu, 22 Sep 2011 02:51:03 +0000 (18:51 -0800)]
presets: use private options in libx264-ipod ffpresets

Change flags2 options to supported libx264 private options.

9 years agoprores: skip alpha if present
Jonne Ahner [Thu, 22 Sep 2011 00:40:49 +0000 (02:40 +0200)]
prores: skip alpha if present

9 years agovf_drawtext: remove useless and misnamed intermediary "baseline" variable in draw_text()
Stefano Sabatini [Wed, 21 Sep 2011 21:47:44 +0000 (23:47 +0200)]
vf_drawtext: remove useless and misnamed intermediary "baseline" variable in draw_text()

9 years agovf_drawtext: fix background box coloring with RGB formats != RGBA
Stefano Sabatini [Wed, 21 Sep 2011 09:02:36 +0000 (11:02 +0200)]
vf_drawtext: fix background box coloring with RGB formats != RGBA

drawbox() expects a color specified in RGBA format, while the code was
providing a color with the components specified in the same order of
the input pixel format.

In particular, fix box coloring with AXXX RGB formats.

9 years agovf_drawtext: prefer int over unsigned int
Stefano Sabatini [Tue, 20 Sep 2011 00:17:08 +0000 (02:17 +0200)]
vf_drawtext: prefer int over unsigned int

This avoids overflow errors when the considered x and y values are
negative, as required by the incoming patches.

9 years agovf_drawtext: use @itemize environment for showing examples in docs
Stefano Sabatini [Tue, 20 Sep 2011 10:48:25 +0000 (12:48 +0200)]
vf_drawtext: use @itemize environment for showing examples in docs

Beautify.

9 years agoCheck for huffman tree building error in vp6 decoder.
Laurent Aimar [Wed, 21 Sep 2011 18:46:32 +0000 (20:46 +0200)]
Check for huffman tree building error in vp6 decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoRelease old pictures after a resolution change in vp5/6 decoder
Laurent Aimar [Wed, 21 Sep 2011 18:46:33 +0000 (20:46 +0200)]
Release old pictures after a resolution change in vp5/6 decoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoCheck for missing reference in vp5/6 decoder.
Laurent Aimar [Wed, 21 Sep 2011 18:46:30 +0000 (20:46 +0200)]
Check for missing reference in vp5/6 decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoCheck for invalid slices offsets in RV30/40 decoder.
Laurent Aimar [Wed, 21 Sep 2011 18:46:31 +0000 (20:46 +0200)]
Check for invalid slices offsets in RV30/40 decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoCheck output buffer size in nellymoser decoder.
Laurent Aimar [Wed, 21 Sep 2011 18:46:29 +0000 (20:46 +0200)]
Check output buffer size in nellymoser decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffprobe: remove misplaced and pointless comment.
Clément Bœsch [Fri, 16 Sep 2011 10:53:28 +0000 (12:53 +0200)]
ffprobe: remove misplaced and pointless comment.

9 years agoffprobe: use av_get_pix_fmt_name() instead of accessing av_pix_fmt_descriptors.
Clément Bœsch [Fri, 16 Sep 2011 10:54:51 +0000 (12:54 +0200)]
ffprobe: use av_get_pix_fmt_name() instead of accessing av_pix_fmt_descriptors.

9 years agoffprobe: remove media_type_string() by inlining av_x_if_null().
Clément Bœsch [Fri, 16 Sep 2011 10:54:19 +0000 (12:54 +0200)]
ffprobe: remove media_type_string() by inlining av_x_if_null().

9 years agolavu: add av_x_if_null().
Clément Bœsch [Fri, 16 Sep 2011 10:52:45 +0000 (12:52 +0200)]
lavu: add av_x_if_null().

9 years agoFix dxva2 decoding for some H264 samples.
Carl Eugen Hoyos [Wed, 21 Sep 2011 21:41:11 +0000 (23:41 +0200)]
Fix dxva2 decoding for some H264 samples.

9 years agoSupport Sorenson Spark in f4v.
Carl Eugen Hoyos [Wed, 21 Sep 2011 21:33:02 +0000 (23:33 +0200)]
Support Sorenson Spark in f4v.

Such files are produced by the Flash Media Server,
see samples/f4v/H263_NM_f.mp4

9 years agoUse the parser for AC-3 in mov.
Carl Eugen Hoyos [Wed, 21 Sep 2011 21:29:38 +0000 (23:29 +0200)]
Use the parser for AC-3 in mov.

Fixes ticket #494.

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 21 Sep 2011 19:25:43 +0000 (21:25 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swfdec: Add support for sample_rate_code 0 (5512 Hz)
  dct-test: factor out some common code and do whas was likely intended
  doc: library versions need to be bumped in version.h
  Revert "ffmpeg: get rid of useless AVInputStream.nb_streams."
  Remove some forgotten AVCodecContext.palctrl usage.
  lavc/utils: move avcodec_init() higher in the file.
  lavc: replace some deprecated FF_*_TYPE with AV_PICTURE_TYPE_*
  ac3dec: actually use drc_scale private option
  lavc: undeprecate AVPALETTE_SIZE and AVPALETTE_COUNT macros
  alsa: add missing header
  msmpeg4: remove leftover unused debug variable declaration
  Fix assert() calls that need updates after FF_COMMON_FRAME macro elimination.
  Fix av_dlog invocations with wrong or missing logging context.
  vf_yadif: add support to yuva420p
  vf_yadif: correct documentation on the parity parameter
  vf_yadif: copy buffer properties like aspect for second frame as well
  oma: support for encrypted files
  id3v2: add support for non-text and GEOB type tag frames
  des: add possibility to calculate DES-CBC-MAC with small buffer

Conflicts:
ffmpeg.c
libavcodec/dct-test.c
libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoswfdec: Add support for sample_rate_code 0 (5512 Hz)
Alex Converse [Wed, 21 Sep 2011 01:40:43 +0000 (18:40 -0700)]
swfdec: Add support for sample_rate_code 0 (5512 Hz)

9 years agodct-test: factor out some common code and do whas was likely intended
Mans Rullgard [Wed, 21 Sep 2011 14:23:34 +0000 (15:23 +0100)]
dct-test: factor out some common code and do whas was likely intended

This fixes some nonsensical code by moving some should-be-shared
code to separate functions and using these.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agodoc: library versions need to be bumped in version.h
Diego Biurrun [Wed, 21 Sep 2011 12:57:29 +0000 (14:57 +0200)]
doc: library versions need to be bumped in version.h

9 years agoRevert "ffmpeg: get rid of useless AVInputStream.nb_streams."
Anton Khirnov [Sun, 11 Sep 2011 10:27:51 +0000 (12:27 +0200)]
Revert "ffmpeg: get rid of useless AVInputStream.nb_streams."

This reverts commit 2cf8355f98681bdd726b739008acd5483f82f8d7.
AVInputStream.nb_streams tracks number of streams found at the
beginning, new streams may appear that ffmpeg doesn't know about. Fixes
crash in this case.

9 years agoRemove some forgotten AVCodecContext.palctrl usage.
Anton Khirnov [Thu, 1 Sep 2011 15:01:53 +0000 (17:01 +0200)]
Remove some forgotten AVCodecContext.palctrl usage.

9 years agolavc/utils: move avcodec_init() higher in the file.
Anton Khirnov [Thu, 1 Sep 2011 14:59:35 +0000 (16:59 +0200)]
lavc/utils: move avcodec_init() higher in the file.

Fixes build on next major bump.

9 years agolavc: replace some deprecated FF_*_TYPE with AV_PICTURE_TYPE_*
Anton Khirnov [Thu, 1 Sep 2011 14:57:20 +0000 (16:57 +0200)]
lavc: replace some deprecated FF_*_TYPE with AV_PICTURE_TYPE_*

9 years agoac3dec: actually use drc_scale private option
Anton Khirnov [Thu, 1 Sep 2011 14:48:29 +0000 (16:48 +0200)]
ac3dec: actually use drc_scale private option

9 years agolavc: undeprecate AVPALETTE_SIZE and AVPALETTE_COUNT macros
Anton Khirnov [Thu, 1 Sep 2011 14:40:18 +0000 (16:40 +0200)]
lavc: undeprecate AVPALETTE_SIZE and AVPALETTE_COUNT macros

They are still being used and shouldn't be removed.

9 years agoalsa: add missing header
Anton Khirnov [Thu, 1 Sep 2011 14:31:02 +0000 (16:31 +0200)]
alsa: add missing header

Fixes compile with next lavc major.

9 years agomsmpeg4: remove leftover unused debug variable declaration
Diego Biurrun [Tue, 20 Sep 2011 07:10:41 +0000 (09:10 +0200)]
msmpeg4: remove leftover unused debug variable declaration

9 years agoFix assert() calls that need updates after FF_COMMON_FRAME macro elimination.
Diego Biurrun [Tue, 13 Sep 2011 15:00:41 +0000 (17:00 +0200)]
Fix assert() calls that need updates after FF_COMMON_FRAME macro elimination.

This fixes build failures with -DDEBUG in CPPFLAGS.

9 years agoFix av_dlog invocations with wrong or missing logging context.
Diego Biurrun [Tue, 13 Sep 2011 15:00:16 +0000 (17:00 +0200)]
Fix av_dlog invocations with wrong or missing logging context.

This fixes build failures with -DDEBUG in CPPFLAGS.

9 years agovf_yadif: add support to yuva420p
Stefano Sabatini [Sat, 27 Aug 2011 16:32:14 +0000 (18:32 +0200)]
vf_yadif: add support to yuva420p

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agovf_yadif: correct documentation on the parity parameter
Stefano Sabatini [Wed, 3 Aug 2011 22:25:35 +0000 (00:25 +0200)]
vf_yadif: correct documentation on the parity parameter

0 is top-field-first, 1 is bottom-field-first, not the other way
around.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agovf_yadif: copy buffer properties like aspect for second frame as well
Joakim Plate [Thu, 14 Jul 2011 20:31:37 +0000 (22:31 +0200)]
vf_yadif: copy buffer properties like aspect for second frame as well

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agooma: support for encrypted files
David Goldwich [Sun, 18 Sep 2011 19:58:09 +0000 (21:58 +0200)]
oma: support for encrypted files

Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoid3v2: add support for non-text and GEOB type tag frames
David Goldwich [Sun, 18 Sep 2011 16:04:34 +0000 (18:04 +0200)]
id3v2: add support for non-text and GEOB type tag frames

This extends the ID3v2 parser to allow for reading of non-text (i.e.
other than T***) meta tag frames providing a ff_id3v2_read_all()
function. An additional data structure 'ID3v2ExtraMeta' is introduced
for these tags since AVDictionary is string oriented and unsuitable
for binary data.

A parser for tag frames of type GEOB is implemented, which is needed
to extract keyring information from encrypted OMA files. GEOB data
is parsed into 'ID3v2ExtraMetaGEOB' data structures.

The routine to decode characters from different encodings to UTF-8,
formerly part of the read_ttag() function, is moved to its own
function. Because some tag frames contain subparts of unknown length,
the function is now also able to read until a null character is found.
In addition, the function now takes care of allocating a buffer long
enough to hold the decoded characters.

Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agodes: add possibility to calculate DES-CBC-MAC with small buffer
David Goldwich [Fri, 2 Sep 2011 06:20:58 +0000 (08:20 +0200)]
des: add possibility to calculate DES-CBC-MAC with small buffer

This patch adds the possibility to calculate the DES-CBC-MAC of a
source buffer (i.e. the last block of the buffer encrypted in CBC
mode) without having to allocate a destination buffer that is as
long as the complete source buffer, but instead only 8 bytes
for the MAC.

Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoprores: Add forgotten Copyright statements
Michael Niedermayer [Wed, 21 Sep 2011 02:03:51 +0000 (04:03 +0200)]
prores: Add forgotten Copyright statements

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 20 Sep 2011 23:05:36 +0000 (01:05 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: Don't blindly skip the 4 trailer bytes from the FLV packets
  rtmp: Handle FLV packets written in more than one write call
  rv34: Check for invalid slice offsets

Conflicts:
libavformat/rtmpproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomp3demux: pass on error code on packet read.
Michael Niedermayer [Tue, 20 Sep 2011 22:51:53 +0000 (00:51 +0200)]
mp3demux: pass on error code on packet read.

Reported-by: Tanami, Ohad
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoprores: Simplify code further
Michael Niedermayer [Tue, 20 Sep 2011 22:05:16 +0000 (00:05 +0200)]
prores: Simplify code further

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoprores: simplify 4444 handling
Jonne Ahner [Tue, 20 Sep 2011 21:54:03 +0000 (23:54 +0200)]
prores: simplify 4444 handling

9 years agoprores: fixes a few prores 4444 samples
Jonne Ahner [Tue, 20 Sep 2011 20:46:36 +0000 (22:46 +0200)]
prores: fixes a few prores 4444 samples

9 years agoprores: use shift instead of multiply
Jonne Ahner [Tue, 20 Sep 2011 20:46:17 +0000 (22:46 +0200)]
prores: use shift instead of multiply

9 years agortspdec: Require TCP-interleaved RTP packets to be at least 11 bytes, instead of 12.
Martin Storsjö [Tue, 20 Sep 2011 19:58:15 +0000 (21:58 +0200)]
rtspdec: Require TCP-interleaved RTP packets to be at least 11 bytes, instead of 12.
(A minimal RTP packet is 12 bytes, but a minimal RTCP packet can be
much smaller, at least as small as 8 bytes.)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibpostproc: mmx code uses stack below %esp, fix that
Yuriy Kaminskiy [Tue, 20 Sep 2011 19:32:35 +0000 (21:32 +0200)]
libpostproc: mmx code uses stack below %esp, fix that

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoUse correct LOCAL_ALIGNED for stack variables instead of DECLARE_ALIGNED.
Reimar Döffinger [Mon, 19 Sep 2011 22:30:25 +0000 (00:30 +0200)]
Use correct LOCAL_ALIGNED for stack variables instead of DECLARE_ALIGNED.

LOCAL_ALIGNED should work for all compilers/systems whereas
DECLARE_ALIGNED does not work on some (do not remember which though).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agoRemove unused variable.
Reimar Döffinger [Mon, 19 Sep 2011 21:06:15 +0000 (23:06 +0200)]
Remove unused variable.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agoHack around gcc 4.6 breaking asm using call.
Reimar Döffinger [Sun, 28 Aug 2011 19:14:13 +0000 (21:14 +0200)]
Hack around gcc 4.6 breaking asm using call.

gcc 4.6 no longer decrements esp to account for local variables.
Thus using call will end up overwriting some local variable.
So add an extra one it can safely clobber.
This is a huge hack because it's basically pure chance it works,
no idea how this is supposed to be done.

Fixes trac ticket #397.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agortmp: Don't blindly skip the 4 trailer bytes from the FLV packets
Martin Storsjö [Tue, 20 Sep 2011 13:00:52 +0000 (16:00 +0300)]
rtmp: Don't blindly skip the 4 trailer bytes from the FLV packets

If not enough bytes are available, keep track of them and skip
them on next call.

In practice, if these trailer bytes are written in a separate
call, there is no other data written in this call, making it
fall into the "FLV packet too small" case currently - working,
but not as intended.

This patch makes the code more robust, handling all cases
except for having the FLV packet header split over multiple
write calls.

Signed-off-by: Martin Storsjö <martin@martin.st>