]> git.sesse.net Git - ffmpeg/log
ffmpeg
12 years agomxfdec: Index table driven demuxing and seeking
Tomas Härdin [Thu, 8 Dec 2011 19:28:49 +0000 (20:28 +0100)]
mxfdec: Index table driven demuxing and seeking

This adds OPAtom support and proper seeking.
D-10 and non-seekable OP1a streams still use the old demuxing/seeking code.

12 years agomxfdec: Compute packet offsets properly
Tomas Härdin [Thu, 8 Dec 2011 11:23:36 +0000 (12:23 +0100)]
mxfdec: Compute packet offsets properly

This replaces the old essence_offset code

12 years agomxfdec: Use MaterialPackage - Track - TrackID instead of the system_item hack
Tomas Härdin [Thu, 8 Dec 2011 10:53:57 +0000 (11:53 +0100)]
mxfdec: Use MaterialPackage - Track - TrackID instead of the system_item hack

12 years agomxfdec: Parse more values in PartitionPack
Tomas Härdin [Thu, 8 Dec 2011 16:45:35 +0000 (17:45 +0100)]
mxfdec: Parse more values in PartitionPack

These values include KAGSize, HeaderByteCount and IndexByteCount.
The length of the pack itself is also stored, and KAGSize is sanity checked.
The FATE sample has KAGSize == 0, which is adjusted to 512.
Other bad KAGSizes are set to 1.

12 years agomxfdec: Parse TemporalOffsets
Tomas Härdin [Thu, 8 Dec 2011 10:39:59 +0000 (11:39 +0100)]
mxfdec: Parse TemporalOffsets

12 years agomxfdec: av_dlog():ify 'no corresponding source package found'
Tomas Härdin [Thu, 8 Dec 2011 10:21:58 +0000 (11:21 +0100)]
mxfdec: av_dlog():ify 'no corresponding source package found'

This isn't an error. It's also expected behavior for OPAtom files.

12 years agomxfdec: Compute essence container offsets and lengths into mxf->partitions
Tomas Härdin [Thu, 8 Dec 2011 10:18:21 +0000 (11:18 +0100)]
mxfdec: Compute essence container offsets and lengths into mxf->partitions

12 years agomxfdec: Make mxf->partitions sorted by offset
Tomas Härdin [Thu, 8 Dec 2011 10:06:23 +0000 (11:06 +0100)]
mxfdec: Make mxf->partitions sorted by offset

This also zeroes new entries for good measure (used by future patches).

12 years agomxfdec: Parse ThisPartition
Tomas Härdin [Wed, 7 Dec 2011 16:43:36 +0000 (17:43 +0100)]
mxfdec: Parse ThisPartition

12 years agomxfdec: Speed up metadata and index parsing
Tomas Härdin [Mon, 14 Mar 2011 16:00:21 +0000 (17:00 +0100)]
mxfdec: Speed up metadata and index parsing

Specifically, this means parsing as before until we run into essence.
At that point we seek to the footer and parse until EOF. After that we start
seeking backward to the previous partition and parse that until we run into
essence or the next partition. This procedure is repeated until we encounter
the last partition we parsed in the forward direction.

The end result of all this is that large essence containers aren't needlessly
parsed. This speeds up parsing large files a lot.

12 years agomxfdec: Make sure DataDefinition is consistent between material track and source...
Tomas Härdin [Mon, 28 Nov 2011 09:51:00 +0000 (10:51 +0100)]
mxfdec: Make sure DataDefinition is consistent between material track and source track

This fixes 0001GL.MXF.V1.mxf_opatom.mxf and 0001GL00.MXF.A1.mxf_opatom.mxf
getting two streams each due to both using the same SourcePackageID.

12 years agomxfdec: Add EssenceContainer UL found in 0001GL00.MXF.A1.mxf_opatom.mxf
Tomas Härdin [Mon, 28 Nov 2011 08:53:10 +0000 (09:53 +0100)]
mxfdec: Add EssenceContainer UL found in 0001GL00.MXF.A1.mxf_opatom.mxf

12 years agogxfenc: support timecode option
Matthieu Bouron [Tue, 6 Dec 2011 20:56:01 +0000 (21:56 +0100)]
gxfenc: support timecode option

Reviewed-by: Baptiste Coudurier
12 years agoDo not ignore full transparency when writing png palette.
Carl Eugen Hoyos [Wed, 7 Dec 2011 10:31:27 +0000 (11:31 +0100)]
Do not ignore full transparency when writing png palette.

This reverts r6689, "Make PNG produce correct 8-bit pictures".

12 years agomovenc: Always write EDTS when we are able to.
Michael Niedermayer [Wed, 7 Dec 2011 04:06:13 +0000 (05:06 +0100)]
movenc: Always write EDTS when we are able to.

Inspired by a patch from Michael Root
Idea-by: Baptiste Coudurier
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'shariman/wmall'
Michael Niedermayer [Wed, 7 Dec 2011 03:49:42 +0000 (04:49 +0100)]
Merge remote-tracking branch 'shariman/wmall'

* shariman/wmall:
  Fix lms_update()
  Move num_lms reading out of a loop
  Use correct value for range
  Fix some int / int16_t / int32_t confusion
  Implement revert_mclms() and associated functions
  Fix two more int16_t vs. int confusion
  Init s->cdlms[][].recent to order - 1
  Add a size argument to dump_int_buffer()
  Get rid of logging that are not required anymore
  Fix some int vs. int16_t confusion

Conflicts:
libavcodec/wmalosslessdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoimg2: 10l typo
Michael Niedermayer [Wed, 7 Dec 2011 02:19:42 +0000 (03:19 +0100)]
img2: 10l typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoAllow auto-detection of ljpg images.
Carl Eugen Hoyos [Wed, 7 Dec 2011 01:32:59 +0000 (02:32 +0100)]
Allow auto-detection of ljpg images.

12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 7 Dec 2011 01:04:00 +0000 (02:04 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Code cleanup - mpegvideo.c - 500-1000line
  rv40: NEON optimised weighted prediction
  rv40: NEON optimised chroma MC
  ARM: move NEON H264 chroma mc to a separate file
  rv34: NEON optimised inverse transform functions

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoh264: init prev_frame_num to -1 on init
Michael Niedermayer [Tue, 6 Dec 2011 21:41:24 +0000 (22:41 +0100)]
h264: init prev_frame_num to -1 on init
Fixes Ticket711

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoh264: Fix memleaks on close, reset more fields
Michael Niedermayer [Tue, 6 Dec 2011 21:40:43 +0000 (22:40 +0100)]
h264: Fix memleaks on close, reset more fields

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoFix 8BPS RGB32 output, the alpha channel was ignored.
Carl Eugen Hoyos [Tue, 6 Dec 2011 22:06:27 +0000 (23:06 +0100)]
Fix 8BPS RGB32 output, the alpha channel was ignored.

Reviewed-by: Roberto Togni
12 years agoCode cleanup - mpegvideo.c - 500-1000line
Konstantin Todorov [Mon, 5 Dec 2011 16:40:28 +0000 (18:40 +0200)]
Code cleanup - mpegvideo.c - 500-1000line

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
12 years agoChoose compression level 6 for zmbv test.
Reimar Döffinger [Tue, 6 Dec 2011 18:48:16 +0000 (19:48 +0100)]
Choose compression level 6 for zmbv test.

The default of 9 gives different results on different FATE systems.
However the zlib test using compression level 6 works, so
try this instead.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agomovdec: remove redundant size<=8 check.
Michael Niedermayer [Tue, 6 Dec 2011 16:40:40 +0000 (17:40 +0100)]
movdec: remove redundant size<=8 check.
Its checked a few lines below too.
The only difference is that empty atoms with size=0 will now get parsed too.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomovdec: Read extended 64bit size before the debug av_log() and only when there
Michael Niedermayer [Tue, 6 Dec 2011 16:35:52 +0000 (17:35 +0100)]
movdec: Read extended 64bit size before the debug av_log() and only when there
was enough space to read the 32bit size.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomovdec: Fix bad computed size for atoms with size 0 in MOV files
Mihnea Balta [Tue, 6 Dec 2011 07:29:47 +0000 (09:29 +0200)]
movdec: Fix bad computed size for atoms with size 0 in MOV files

The computed size doesn't contain the header size because it's already
skipped by incrementing total_size, but then it's skipped again in the
last line. The atom comes out 8 bytes short and the function
mov_read_chan() aborts the whole parsing process. I think the computed
size should be atom.size - total_size + 8.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomov: increase total_size only when it actually increases.
Michael Niedermayer [Tue, 6 Dec 2011 16:21:05 +0000 (17:21 +0100)]
mov: increase total_size only when it actually increases.
This is just cosmetic as the if() is always true.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomovenc: support spliting fragments based on bytesize instead of duration.
Michael Niedermayer [Tue, 6 Dec 2011 15:21:10 +0000 (16:21 +0100)]
movenc: support spliting fragments based on bytesize instead of duration.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomovenc: fragment support
Michael Niedermayer [Tue, 6 Dec 2011 15:15:35 +0000 (16:15 +0100)]
movenc: fragment support

Reviewed-by: Baptiste Coudurier
Tested-with-QT: Baptiste Coudurier
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffmpeg: Warn if filters poll & request frame behave wrongly.
Michael Niedermayer [Tue, 6 Dec 2011 15:01:21 +0000 (16:01 +0100)]
ffmpeg: Warn if filters poll & request frame behave wrongly.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agovsrc_life: fix comment in parse_rule()
Stefano Sabatini [Sun, 4 Dec 2011 22:49:03 +0000 (23:49 +0100)]
vsrc_life: fix comment in parse_rule()

12 years agovf_scale: give a clue in case of invalid expression self-reference
Stefano Sabatini [Sun, 4 Dec 2011 22:33:40 +0000 (23:33 +0100)]
vf_scale: give a clue in case of invalid expression self-reference

Address trac ticket #706.

12 years agorv40: NEON optimised weighted prediction
Janne Grunau [Mon, 5 Dec 2011 21:22:57 +0000 (21:22 +0000)]
rv40: NEON optimised weighted prediction

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agorv40: NEON optimised chroma MC
Janne Grunau [Mon, 5 Dec 2011 21:18:05 +0000 (21:18 +0000)]
rv40: NEON optimised chroma MC

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agoARM: move NEON H264 chroma mc to a separate file
Mans Rullgard [Tue, 6 Dec 2011 12:44:05 +0000 (12:44 +0000)]
ARM: move NEON H264 chroma mc to a separate file

This allows sharing code with the rv40 version of these functions.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agorv34: NEON optimised inverse transform functions
Janne Grunau [Sat, 24 Sep 2011 11:05:55 +0000 (13:05 +0200)]
rv34: NEON optimised inverse transform functions

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 6 Dec 2011 00:37:27 +0000 (01:37 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mov: Don't av_malloc(0).
  avconv: only allocate 1 AVFrame per input stream
  avconv: fix memleaks due to not freeing the AVFrame for audio
  h264-fate: remove -strict 1 except where necessary (mr4/5-tandberg).
  misc Doxygen markup improvements
  doxygen: eliminate Qt-style doxygen syntax
  g722: Add a regression test for muxing/demuxing in wav
  g722: Change bits per sample to 4
  g722dec: Signal skipping the lower bits via AVOptions instead of bits_per_coded_sample
  api-example: update to use avcodec_decode_audio4()
  avplay: use avcodec_decode_audio4()
  avplay: use a separate buffer for playing silence
  avformat: use avcodec_decode_audio4() in avformat_find_stream_info()
  avconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3()
  mov: Allow empty stts atom.
  doc: document preferred Doxygen syntax and make patcheck detect it

Conflicts:
avconv.c
ffplay.c
libavcodec/mlpdec.c
libavcodec/version.h
libavformat/mov.c
tests/codec-regression.sh
tests/fate/h264.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoDo not fail fatally if chan atom is too short.
Carl Eugen Hoyos [Mon, 5 Dec 2011 23:16:22 +0000 (00:16 +0100)]
Do not fail fatally if chan atom is too short.

12 years agoFix compilation for C++ applications
Gavin Kinsey [Mon, 5 Dec 2011 15:15:29 +0000 (15:15 +0000)]
Fix compilation for C++ applications

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomovdec: Fix parsing of a very last empty atom of size 8.
Michael Niedermayer [Mon, 5 Dec 2011 17:04:19 +0000 (18:04 +0100)]
movdec: Fix parsing of a very last empty atom of size 8.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoAdd tests for several encoders.
Reimar Döffinger [Tue, 29 Nov 2011 23:13:54 +0000 (00:13 +0100)]
Add tests for several encoders.

More specifically, PNG, v210, zlib and zmbv codecs.
zmbv needs vf_scale to be able to produce PAL8.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agovf_scale: support PAL8 output by producing BGR8.
Reimar Döffinger [Tue, 29 Nov 2011 23:06:25 +0000 (00:06 +0100)]
vf_scale: support PAL8 output by producing BGR8.

While quality is bad, PAL8 support is needed to allow testing some
encoders that only support PAL8 input.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoAdd coverage exclusions for test code.
Reimar Döffinger [Tue, 29 Nov 2011 21:01:09 +0000 (22:01 +0100)]
Add coverage exclusions for test code.

For some of the code e.g. doing timing measurements there is no
real point in running regression testing on it, thus it should
not be counted against coverage.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoAdd coverage support.
Reimar Döffinger [Tue, 29 Nov 2011 19:35:48 +0000 (20:35 +0100)]
Add coverage support.

Adds --enable-coverage to configure and a "coverage-html" make target.
The dependency stuff in the Makefile is a bit questionable, but the
best I could think of so far.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agomov: Don't av_malloc(0).
Alex Converse [Mon, 5 Dec 2011 00:38:05 +0000 (16:38 -0800)]
mov: Don't av_malloc(0).

malloc() is allowed to return NULL when zero is the argument. This
causes us to think malloc has failed and return AVERROR(ENOMEM). In
addition OS X malloc() returns an unfreeable non-NULL pointer for size
zero when alignment is greater than 16.

12 years agoavconv: only allocate 1 AVFrame per input stream
Justin Ruggles [Mon, 5 Dec 2011 16:49:38 +0000 (11:49 -0500)]
avconv: only allocate 1 AVFrame per input stream

This avoids allocating/freeing an AVFrame for each packet decode. It also
simplifies error handling in transcode_audio() and transcode_video().

12 years agoavconv: fix memleaks due to not freeing the AVFrame for audio
Justin Ruggles [Mon, 5 Dec 2011 15:36:54 +0000 (10:36 -0500)]
avconv: fix memleaks due to not freeing the AVFrame for audio

12 years agoh264-fate: remove -strict 1 except where necessary (mr4/5-tandberg).
Ronald S. Bultje [Sat, 26 Nov 2011 21:10:17 +0000 (13:10 -0800)]
h264-fate: remove -strict 1 except where necessary (mr4/5-tandberg).

12 years agolavc: Mark fields that require av_opt_ptr()
Michael Niedermayer [Mon, 5 Dec 2011 12:23:17 +0000 (13:23 +0100)]
lavc: Mark fields that require av_opt_ptr()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolavc: Fix sizeof(AVFrame) useability docs
Michael Niedermayer [Mon, 5 Dec 2011 12:22:46 +0000 (13:22 +0100)]
lavc: Fix sizeof(AVFrame) useability docs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolavc: Document AVFrame av_opt_ptr() relation.
Michael Niedermayer [Mon, 5 Dec 2011 12:22:20 +0000 (13:22 +0100)]
lavc: Document AVFrame av_opt_ptr() relation.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomisc Doxygen markup improvements
Diego Biurrun [Sun, 30 Oct 2011 18:10:50 +0000 (19:10 +0100)]
misc Doxygen markup improvements

12 years agodoxygen: eliminate Qt-style doxygen syntax
Diego Biurrun [Sun, 30 Oct 2011 17:27:33 +0000 (18:27 +0100)]
doxygen: eliminate Qt-style doxygen syntax

12 years agog722: Add a regression test for muxing/demuxing in wav
Martin Storsjö [Sat, 3 Dec 2011 22:58:31 +0000 (00:58 +0200)]
g722: Add a regression test for muxing/demuxing in wav

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agog722: Change bits per sample to 4
Sjoerd Simons [Thu, 1 Dec 2011 23:08:35 +0000 (01:08 +0200)]
g722: Change bits per sample to 4

Earlier, bits per sample was defined as 8, since
bits_per_coded_sample was used to indicate whether to ignore
the lower bits of the codeword, having values 6, 7 or 8.

g722 encodes 2 samples into one byte codeword, therefore the
bits per sample is 4. By changing this, the generated timestamps
for streams encoded with g722 become correct.

This makes timestamp generation for g722 data correct (both when
encoding and when demuxing from raw g722 files).

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agog722dec: Signal skipping the lower bits via AVOptions instead of bits_per_coded_sample
Martin Storsjö [Sat, 3 Dec 2011 17:54:20 +0000 (19:54 +0200)]
g722dec: Signal skipping the lower bits via AVOptions instead of bits_per_coded_sample

This avoids using bits_per_coded_sample for this information.
bits_per_coded_sample should be 4 for this codec normally,
since two samples are encoded into one 8 bit codeword.

In principle, this might be info that needs to be passed from
a demuxer, and in that case, a private AVOption isn't the best
choice, but no such samples are available at the moment, so
that use case is purely theoretical at the moment.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoffplay: Avoid directly accessing AVFrame fields that differ between forks.
Michael Niedermayer [Sat, 3 Dec 2011 20:21:30 +0000 (21:21 +0100)]
ffplay: Avoid directly accessing AVFrame fields that differ between forks.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffmpeg: Avoid directly accessing AVFrame fields that differ between forks.
Michael Niedermayer [Sat, 3 Dec 2011 20:20:50 +0000 (21:20 +0100)]
ffmpeg: Avoid directly accessing AVFrame fields that differ between forks.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolavc: Add a AVClass for AVFrames.
Michael Niedermayer [Sat, 3 Dec 2011 20:17:52 +0000 (21:17 +0100)]
lavc: Add a AVClass for AVFrames.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoav_opt: add av_opt_ptr() to return a pointer to a field of a object based on
Michael Niedermayer [Sat, 3 Dec 2011 20:16:46 +0000 (21:16 +0100)]
av_opt: add av_opt_ptr() to return a pointer to a field of a object based on
an AVClass

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffmpeg: handle stream copy timebase selection for mp4 as if it had VFPS set.
Michael Niedermayer [Mon, 5 Dec 2011 02:19:28 +0000 (03:19 +0100)]
ffmpeg: handle stream copy timebase selection for mp4 as if it had VFPS set.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoapi-example: update to use avcodec_decode_audio4()
Justin Ruggles [Fri, 11 Nov 2011 20:44:41 +0000 (15:44 -0500)]
api-example: update to use avcodec_decode_audio4()

12 years agoavplay: use avcodec_decode_audio4()
Justin Ruggles [Wed, 12 Oct 2011 17:27:41 +0000 (13:27 -0400)]
avplay: use avcodec_decode_audio4()

12 years agoavplay: use a separate buffer for playing silence
Justin Ruggles [Tue, 11 Oct 2011 19:49:39 +0000 (15:49 -0400)]
avplay: use a separate buffer for playing silence

12 years agoavformat: use avcodec_decode_audio4() in avformat_find_stream_info()
Justin Ruggles [Wed, 2 Nov 2011 18:35:36 +0000 (14:35 -0400)]
avformat: use avcodec_decode_audio4() in avformat_find_stream_info()

12 years agoavconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3()
Justin Ruggles [Mon, 21 Nov 2011 22:41:49 +0000 (17:41 -0500)]
avconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3()

12 years agomov: Allow empty stts atom.
Alex Converse [Sat, 3 Dec 2011 01:00:11 +0000 (17:00 -0800)]
mov: Allow empty stts atom.

Fixes regressions caused by 30c3d976

12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 4 Dec 2011 23:11:57 +0000 (00:11 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  adpcmenc: cosmetics: pretty-printing
  ac3dec: cosmetics: pretty-printing
  yuv4mpeg: cosmetics: pretty-printing
  shorten: remove dead initialization
  roqvideodec: set AVFrame reference before reget_buffer.
  bmp: fix some 1bit samples.
  latmdec: add fate test for audio config change
  oma: PCM support
  oma: better format detection with small probe buffer
  oma: clearify ambiguous if condition
  wavpack: Properly clip samples during lossy decode
  Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c.
  Cleaned pixdesc.c file in libavutil
  zmbv.c: coding style clean-up.
  xan.c: coding style clean-up.
  mpegvideo.c: code cleanup - first 500 lines.

Conflicts:
Changelog
libavcodec/adpcmenc.c
libavcodec/bmp.c
libavcodec/zmbv.c
libavutil/log.c
libavutil/pixdesc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodoc: document preferred Doxygen syntax and make patcheck detect it
Diego Biurrun [Tue, 8 Nov 2011 14:01:47 +0000 (15:01 +0100)]
doc: document preferred Doxygen syntax and make patcheck detect it

12 years agoadpcmenc: cosmetics: pretty-printing
Chris Berov [Fri, 2 Dec 2011 19:52:49 +0000 (21:52 +0200)]
adpcmenc: cosmetics: pretty-printing

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
12 years agoac3dec: cosmetics: pretty-printing
Chris Berov [Fri, 2 Dec 2011 15:46:01 +0000 (17:46 +0200)]
ac3dec: cosmetics: pretty-printing

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
12 years agoyuv4mpeg: cosmetics: pretty-printing
Chris Berov [Wed, 30 Nov 2011 11:16:07 +0000 (13:16 +0200)]
yuv4mpeg: cosmetics: pretty-printing

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
12 years agolavfi: add life source
Stefano Sabatini [Sun, 26 Jun 2011 17:47:18 +0000 (19:47 +0200)]
lavfi: add life source

12 years agoaevalsrc: add duration option
Stefano Sabatini [Fri, 2 Dec 2011 14:33:15 +0000 (15:33 +0100)]
aevalsrc: add duration option

12 years agoshorten: remove dead initialization
Paul B. Mahol [Tue, 29 Nov 2011 01:52:58 +0000 (01:52 +0000)]
shorten: remove dead initialization

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
12 years agoMicrosoft Windows ICO demuxer
Peter Ross [Sun, 4 Dec 2011 06:45:24 +0000 (17:45 +1100)]
Microsoft Windows ICO demuxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoroqvideodec: set AVFrame reference before reget_buffer.
Reimar Döffinger [Sat, 5 Nov 2011 22:27:00 +0000 (23:27 +0100)]
roqvideodec: set AVFrame reference before reget_buffer.

Otherwise it might return a write-only frame which would break
decoding completely.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agobmp: fix some 1bit samples.
Carl Eugen Hoyos [Thu, 10 Nov 2011 22:07:27 +0000 (23:07 +0100)]
bmp: fix some 1bit samples.

<= 8bpp BMP images always have palette.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agolatmdec: add fate test for audio config change
Janne Grunau [Fri, 2 Dec 2011 23:21:06 +0000 (00:21 +0100)]
latmdec: add fate test for audio config change

12 years agodoc/filters.texi: Update drawtext docs so that the documented input width/height...
Michael Niedermayer [Sun, 4 Dec 2011 14:31:58 +0000 (15:31 +0100)]
doc/filters.texi: Update drawtext docs so that the documented input width/height variables are compatible with qatar.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agovf_drawtext: support W/H parameters to reduce UI differences to qatar
Michael Niedermayer [Sun, 4 Dec 2011 14:29:26 +0000 (15:29 +0100)]
vf_drawtext: support W/H parameters to reduce UI differences to qatar

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffmpeg: select best pixel format for the encoder if no exact match.
Michael Niedermayer [Sun, 4 Dec 2011 14:26:52 +0000 (15:26 +0100)]
ffmpeg: select best pixel format for the encoder if no exact match.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agooma: PCM support
David Goldwich [Fri, 2 Dec 2011 04:54:21 +0000 (05:54 +0100)]
oma: PCM support

Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agooma: better format detection with small probe buffer
David Goldwich [Fri, 2 Dec 2011 04:54:20 +0000 (05:54 +0100)]
oma: better format detection with small probe buffer

Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agooma: clearify ambiguous if condition
David Goldwich [Fri, 2 Dec 2011 04:54:19 +0000 (05:54 +0100)]
oma: clearify ambiguous if condition

Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agovf_drawtext: cosmetics to reduce diff to qatar
Michael Niedermayer [Sun, 4 Dec 2011 01:27:13 +0000 (02:27 +0100)]
vf_drawtext: cosmetics to reduce diff to qatar

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agovf_drawtext: Add main_w/h to improve compatibility with the modified UI
Michael Niedermayer [Sun, 4 Dec 2011 01:08:56 +0000 (02:08 +0100)]
vf_drawtext: Add main_w/h to improve compatibility with the modified UI
from the fork.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoh264: show when has_b_frames is being increased.
Michael Niedermayer [Sun, 4 Dec 2011 00:41:22 +0000 (01:41 +0100)]
h264: show when has_b_frames is being increased.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 4 Dec 2011 00:02:37 +0000 (01:02 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: fix frame reordering code.
  fate: Add a test for the VBLE decoder
  doc: break some long lines in developer.texi
  drawtext: make x and y parametric
  drawtext: manage memory allocation better
  drawtext: refactor draw_text
  doc: remove space between variable and post increment in example code

Conflicts:
doc/developer.texi
doc/filters.texi
libavcodec/h264.c
libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agowavpack: Properly clip samples during lossy decode
Derek Buitenhuis [Sat, 3 Dec 2011 19:35:23 +0000 (14:35 -0500)]
wavpack: Properly clip samples during lossy decode

When decoding lossy WavPack samples, they are supposed
to be clipped, in order to be decoded correctly.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
12 years agoCode clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c.
Yordan Makariev [Sat, 3 Dec 2011 18:25:57 +0000 (20:25 +0200)]
Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
12 years agoCleaned pixdesc.c file in libavutil
Tsvetelina Borisova [Sat, 3 Dec 2011 18:23:52 +0000 (20:23 +0200)]
Cleaned pixdesc.c file in libavutil

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
12 years agozmbv.c: coding style clean-up.
Nathan Adil Maxson [Fri, 2 Dec 2011 19:08:56 +0000 (11:08 -0800)]
zmbv.c: coding style clean-up.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
12 years agoxan.c: coding style clean-up.
Nathan Adil Maxson [Fri, 2 Dec 2011 23:00:16 +0000 (15:00 -0800)]
xan.c: coding style clean-up.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
12 years agompegvideo.c: code cleanup - first 500 lines.
Konstantin Todorov [Wed, 30 Nov 2011 20:55:45 +0000 (22:55 +0200)]
mpegvideo.c: code cleanup - first 500 lines.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
12 years agoflvdec: Stop searching for streams once a audio & a video stream has been found
Michael Niedermayer [Sat, 3 Dec 2011 17:58:28 +0000 (18:58 +0100)]
flvdec: Stop searching for streams once a audio & a video stream has been found
instead of when the 2nd stream has been found.
This isnt ideal as we will likely still like before miss a data stream.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoAdd forgotten %ifdef HAVE_AVX.
Reimar Döffinger [Sat, 3 Dec 2011 19:46:42 +0000 (20:46 +0100)]
Add forgotten %ifdef HAVE_AVX.

Fixes compilation with older YASM/NASM versions.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agoh264: fix frame reordering code.
Ronald S. Bultje [Wed, 30 Nov 2011 06:22:44 +0000 (22:22 -0800)]
h264: fix frame reordering code.

Fixes fate-h264-conformance-{mr2_tandberg_e,mr3_tandberg_b} without
requiring -strict 1.

12 years agolavu/error: define AVERROR_BUG.
Nicolas George [Sat, 3 Dec 2011 10:21:30 +0000 (11:21 +0100)]
lavu/error: define AVERROR_BUG.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>