ffmpeg.git
7 years agoffserver: use avcodec_get_context_defaults3()
Paul B Mahol [Sun, 5 Feb 2012 22:53:31 +0000 (22:53 +0000)]
ffserver: use avcodec_get_context_defaults3()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 7 Feb 2012 00:40:29 +0000 (01:40 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Revert "v210enc: use FFALIGN()"
  doxygen: Do not include license boilerplates in Doxygen comment blocks.
  avplay: reset decoder flush state when seeking
  ape: skip packets with invalid size
  ape: calculate final packet size instead of guessing
  ape: stop reading after the last frame has been read
  ape: return AVERROR_EOF instead of AVERROR(EIO) when demuxing is finished
  ape: return error if seeking to the current packet fails in ape_read_packet()
  avcodec: Clarify AVFrame member documentation.
  v210dec: check for coded_frame allocation failure
  v210enc: use stride as it is already calculated
  v210enc: use FFALIGN()
  v210enc: return proper AVERROR codes instead of -1
  v210enc: do not set coded_frame->key_frame
  v210enc: check for coded_frame allocation failure
  drawtext: add 'fix_bounds' option on coords fixing
  drawtext: fix text_{w, h} expression vars
  drawtext: add missing braces around an if() block.

Conflicts:
libavcodec/arm/vp8.h
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/v210dec.c
libavfilter/vf_drawtext.c
libavformat/ape.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoutvideo: remove ff_thread_finish_setup, it isn't needed at all
Paul B Mahol [Mon, 6 Feb 2012 21:30:29 +0000 (21:30 +0000)]
utvideo: remove ff_thread_finish_setup, it isn't needed at all

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoDetect theora keyframes by content in Ogg demuxer.
Reimar Döffinger [Mon, 6 Feb 2012 21:03:25 +0000 (22:03 +0100)]
Detect theora keyframes by content in Ogg demuxer.

A lot of files do not mark keyframes correctly via
granule, so detect keyframe or not based on data
and complain if it mismatches.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoffv1: PIX_FMT_GRAY16 support
Paul B Mahol [Mon, 6 Feb 2012 18:23:44 +0000 (18:23 +0000)]
ffv1: PIX_FMT_GRAY16 support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoDNxHD: remove ff_thread_finish_setup, it isn't needed at all.
Javier Cabezas [Mon, 6 Feb 2012 18:36:39 +0000 (19:36 +0100)]
DNxHD: remove ff_thread_finish_setup, it isn't needed at all.

Should fix issue #938

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: document the unit for the -fs option parameter
Stefano Sabatini [Wed, 18 Jan 2012 12:13:41 +0000 (13:13 +0100)]
ffmpeg: document the unit for the -fs option parameter

7 years agolavfi: add setfield filter
Stefano Sabatini [Wed, 1 Feb 2012 23:31:00 +0000 (00:31 +0100)]
lavfi: add setfield filter

7 years agolavf/4xm: use proper error codes
Stefano Sabatini [Mon, 6 Feb 2012 09:46:53 +0000 (10:46 +0100)]
lavf/4xm: use proper error codes

7 years agoRevert "v210enc: use FFALIGN()"
Paul B Mahol [Mon, 6 Feb 2012 17:54:39 +0000 (17:54 +0000)]
Revert "v210enc: use FFALIGN()"

FFALIGN doesn't work with non-powers-of-2.

This reverts commit 7ad1b612c8a2a1b1b47f6c3c580ced4bca17e1c7.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agodoxygen: Do not include license boilerplates in Doxygen comment blocks.
Diego Biurrun [Sun, 5 Feb 2012 10:31:33 +0000 (11:31 +0100)]
doxygen: Do not include license boilerplates in Doxygen comment blocks.

7 years agoavplay: reset decoder flush state when seeking
Justin Ruggles [Sat, 4 Feb 2012 22:32:26 +0000 (17:32 -0500)]
avplay: reset decoder flush state when seeking

Fixes seeking after decoder has already been flushed for codecs using
CODEC_CAP_DELAY.

7 years agoape: skip packets with invalid size
Justin Ruggles [Sat, 4 Feb 2012 22:08:34 +0000 (17:08 -0500)]
ape: skip packets with invalid size

7 years agoape: calculate final packet size instead of guessing
Justin Ruggles [Sat, 4 Feb 2012 22:01:03 +0000 (17:01 -0500)]
ape: calculate final packet size instead of guessing

Calculates based on total file size and wavetaillength from the header.
Falls back to multiplying finalframeblocks by 8 instead of 4 so that it will
at least be overestimating for 24-bit. Currently it can underestimate the
final packet size, leading to decoding errors.

7 years agoape: stop reading after the last frame has been read
Justin Ruggles [Sat, 4 Feb 2012 21:34:20 +0000 (16:34 -0500)]
ape: stop reading after the last frame has been read

This avoids buffer overread when the last packet size estimate is too small.

7 years agoape: return AVERROR_EOF instead of AVERROR(EIO) when demuxing is finished
Justin Ruggles [Sat, 4 Feb 2012 21:31:37 +0000 (16:31 -0500)]
ape: return AVERROR_EOF instead of AVERROR(EIO) when demuxing is finished

7 years agoape: return error if seeking to the current packet fails in ape_read_packet()
Justin Ruggles [Sat, 4 Feb 2012 21:29:37 +0000 (16:29 -0500)]
ape: return error if seeking to the current packet fails in ape_read_packet()

7 years agoavcodec: Clarify AVFrame member documentation.
Kieran Kunhya [Sun, 5 Feb 2012 10:28:58 +0000 (04:28 -0600)]
avcodec: Clarify AVFrame member documentation.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agodoc/filters.texi: use multiple @example blocks for distinct examples in setdar docs
Stefano Sabatini [Tue, 24 Jan 2012 22:50:33 +0000 (23:50 +0100)]
doc/filters.texi: use multiple @example blocks for distinct examples in setdar docs

7 years agodoc/filters.texi: prefer @example over the unsupported @math for showing equation
Stefano Sabatini [Tue, 24 Jan 2012 22:32:49 +0000 (23:32 +0100)]
doc/filters.texi: prefer @example over the unsupported @math for showing equation

7 years agodoc/filters.texi: merge setdar and setsar documentation
Stefano Sabatini [Tue, 24 Jan 2012 22:28:26 +0000 (23:28 +0100)]
doc/filters.texi: merge setdar and setsar documentation

Most of the documentation is common to both filters, and I'm going to add
more shared docs. Factorize.

7 years agolavu: introduce av_parse_ratio() and use it in ffmpeg and lavfi/aspect
Stefano Sabatini [Tue, 17 Jan 2012 14:25:14 +0000 (15:25 +0100)]
lavu: introduce av_parse_ratio() and use it in ffmpeg and lavfi/aspect

Factorize code and provide ratio parsing consistency.

7 years agoffprobe: fix typo in ESCAPE_CHECK_SIZE
Stefano Sabatini [Mon, 6 Feb 2012 09:44:54 +0000 (10:44 +0100)]
ffprobe: fix typo in ESCAPE_CHECK_SIZE

7 years agov210dec: check for coded_frame allocation failure
Paul B Mahol [Sun, 5 Feb 2012 21:14:39 +0000 (21:14 +0000)]
v210dec: check for coded_frame allocation failure

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agov210enc: use stride as it is already calculated
Paul B Mahol [Sun, 5 Feb 2012 21:14:38 +0000 (21:14 +0000)]
v210enc: use stride as it is already calculated

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agov210enc: use FFALIGN()
Paul B Mahol [Sun, 5 Feb 2012 21:14:37 +0000 (21:14 +0000)]
v210enc: use FFALIGN()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agov210enc: return proper AVERROR codes instead of -1
Paul B Mahol [Sun, 5 Feb 2012 21:14:36 +0000 (21:14 +0000)]
v210enc: return proper AVERROR codes instead of -1

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agov210enc: do not set coded_frame->key_frame
Paul B Mahol [Sun, 5 Feb 2012 21:14:35 +0000 (21:14 +0000)]
v210enc: do not set coded_frame->key_frame

It is already set in avcodec_alloc_frame().

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agov210enc: check for coded_frame allocation failure
Paul B Mahol [Sun, 5 Feb 2012 21:14:34 +0000 (21:14 +0000)]
v210enc: check for coded_frame allocation failure

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agodrawtext: add 'fix_bounds' option on coords fixing
Andrey Utkin [Sun, 5 Feb 2012 12:41:01 +0000 (14:41 +0200)]
drawtext: add 'fix_bounds' option on coords fixing

Before, drawtext filter deliberately altered given text coordinates if
text didn't fully fit on the picture. This breaks the use case of
scrolling large text, e.g. movie closing credits.
Add 'fix_bounds', to make it usable in such cases (by setting its value to 0).
Default behavior is not changed, and non-fitting text coords are fixed.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agodrawtext: fix text_{w, h} expression vars
Andrey Utkin [Sat, 4 Feb 2012 22:14:16 +0000 (00:14 +0200)]
drawtext: fix text_{w, h} expression vars

Before, {text_,}{w,h} vars hadn't got initialized

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agocache: fix "warning: passing argument 2 of ‘av_tempfile’ from incompatible pointer...
Michael Niedermayer [Mon, 6 Feb 2012 00:02:45 +0000 (01:02 +0100)]
cache: fix "warning: passing argument 2 of ‘av_tempfile’ from incompatible pointer type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofix "warning: variable ‘cflags’ set but not used"
Michael Niedermayer [Mon, 6 Feb 2012 00:02:07 +0000 (01:02 +0100)]
fix "warning: variable ‘cflags’ set but not used"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavio: Fix "warning: initialization from incompatible pointer type"
Michael Niedermayer [Sun, 5 Feb 2012 22:21:51 +0000 (23:21 +0100)]
avio: Fix "warning: initialization from incompatible pointer type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agochangelog: fix typo
Paul B Mahol [Sun, 5 Feb 2012 23:31:12 +0000 (00:31 +0100)]
changelog: fix typo

7 years agov408: do not unconditionally compile codecs
Paul B Mahol [Sun, 5 Feb 2012 23:29:32 +0000 (00:29 +0100)]
v408: do not unconditionally compile codecs

7 years agoAdd v408 / AYUV encoder and decoder.
Carl Eugen Hoyos [Sun, 5 Feb 2012 19:43:33 +0000 (20:43 +0100)]
Add v408 / AYUV encoder and decoder.

Fixes last part of ticket #470.

Reviewed-by: Paul B Mahol
7 years agoSupport YV12 from video4linux2 devices.
Carl Eugen Hoyos [Sun, 5 Feb 2012 19:06:12 +0000 (20:06 +0100)]
Support YV12 from video4linux2 devices.

Reviewed-by: Luca Abeni
7 years agoAllow muxing VP6A into flv.
Carl Eugen Hoyos [Sun, 5 Feb 2012 16:42:26 +0000 (17:42 +0100)]
Allow muxing VP6A into flv.

Reviewed-by: James Zern
7 years agooggdec: add missing ogg_reset on seek.
Reimar Döffinger [Sat, 4 Feb 2012 20:04:19 +0000 (21:04 +0100)]
oggdec: add missing ogg_reset on seek.

It would never be called when the searched-for position
was already in the index.
In the other cases, the ogg_reset at the end of the
read_timestamp function handled it.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agooggdec: fix keyframe seeking when granule_is_start is 0.
Reimar Döffinger [Sat, 4 Feb 2012 19:31:21 +0000 (20:31 +0100)]
oggdec: fix keyframe seeking when granule_is_start is 0.

In this case, the pts values will be delayed by one, but
at the same time pts values might only be supplied for e.g.
keyframes.
This results on only the frame after the keyframe having a
pts value.
As a hack, make read_timestamp return the keyframe position
together with the pts from a following frame when seeking
to a keyframe.
Fixes trac issue #438.
However it causes the read_timestamp function to return a
pos value that is actually before the packet with the
indicated pts.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agodrawtext: add missing braces around an if() block.
Andrey Utkin [Sat, 4 Feb 2012 22:14:15 +0000 (00:14 +0200)]
drawtext: add missing braces around an if() block.

Prevents uninitialized read.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoffmpeg: document avi special case
Michael Niedermayer [Sun, 5 Feb 2012 04:14:26 +0000 (05:14 +0100)]
ffmpeg: document avi special case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 5 Feb 2012 02:02:23 +0000 (03:02 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ape: fix seeking
  apedec: 8bit and 24bit support

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodwt: fix about a dozen "warning: assignment from incompatible pointer type"
Michael Niedermayer [Sun, 5 Feb 2012 01:08:03 +0000 (02:08 +0100)]
dwt: fix about a dozen "warning: assignment from incompatible pointer type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodwt: fix a dozen or so "warning: initialization from incompatible pointer type"
Michael Niedermayer [Sun, 5 Feb 2012 01:00:02 +0000 (02:00 +0100)]
dwt: fix a dozen or so "warning: initialization from incompatible pointer type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegaudiodec: remove unused variable
Michael Niedermayer [Sun, 5 Feb 2012 00:34:59 +0000 (01:34 +0100)]
mpegaudiodec: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoape: fix seeking
Paul B Mahol [Fri, 3 Feb 2012 18:30:18 +0000 (18:30 +0000)]
ape: fix seeking

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agoadler32: add comment for the SIMD code
Michael Niedermayer [Sat, 4 Feb 2012 19:27:02 +0000 (20:27 +0100)]
adler32: add comment for the SIMD code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoadler32: rewrite using integer SIMD.
Michael Niedermayer [Sat, 4 Feb 2012 06:52:31 +0000 (07:52 +0100)]
adler32: rewrite using integer SIMD.

about twice as fast as before.
the not CONFIG_SMALL case is also droped as it is not faster than the
CONFIG_SMALL case.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRemove warning about Ogg skeleton v4.
Reimar Döffinger [Sat, 4 Feb 2012 19:15:55 +0000 (20:15 +0100)]
Remove warning about Ogg skeleton v4.

We can handle v4 just fine, the parts we currently use
are the same for v3 and v4.
v4 can in addition contain an index which we so far do
not use though.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoapedec: 8bit and 24bit support
Paul B Mahol [Fri, 3 Feb 2012 15:37:06 +0000 (15:37 +0000)]
apedec: 8bit and 24bit support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agofate: use compression level 0 for flashsv2 tests.
Clément Bœsch [Fri, 3 Feb 2012 19:28:32 +0000 (20:28 +0100)]
fate: use compression level 0 for flashsv2 tests.

Output sizes mismatch (and thus MD5) between zlib version 1.2.5 and
1.2.6 if compression level > 0. The issue doesn't affect the intra-only
tests.

7 years agoFix potential infinite discard loop.
Reimar Döffinger [Sat, 4 Feb 2012 14:27:34 +0000 (15:27 +0100)]
Fix potential infinite discard loop.

Fixes trac issue #438.
Seeking in that sample would cause ogg_read_timestamp to fail
because ogg_packet would go into a state where all packets
of stream 1 would be discarded until the end of the stream.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoadler32: avoid "too big" check in the inner loop
Michael Niedermayer [Fri, 3 Feb 2012 21:18:05 +0000 (22:18 +0100)]
adler32: avoid "too big" check in the inner loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoxvid_rc: check that write() succeeded.
Michael Niedermayer [Sat, 4 Feb 2012 00:09:29 +0000 (01:09 +0100)]
xvid_rc: check that write() succeeded.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 4 Feb 2012 01:14:54 +0000 (02:14 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsputil: remove debug message in dsputil_init().
  movdec: Avoid av_malloc(0) in stss
  build: Drop YASM-OBJS-FFT from SUBDIR_VARS.
  build: Drop unused X86-OBJS variable.
  avconv: remove debugging cruft from do_video_out().
  avconv: factorize setting stream_index for the output packet.
  frame{crc/md5}: set the stream timebase from codec timebase.
  apedec: remove unneeded #include of get_bits.h and associated macro
  apedec: av_fast_malloc() instead of av_realloc()
  apedec: fix handling of packet sizes that are not a multiple of 4 bytes

Conflicts:
libavcodec/apedec.c
tests/ref/fate/4xm-1
tests/ref/fate/4xm-2
tests/ref/fate/aasc
tests/ref/fate/armovie-escape124
tests/ref/fate/bethsoft-vid
tests/ref/fate/cljr
tests/ref/fate/creatureshock-avs
tests/ref/fate/cscd
tests/ref/fate/cvid-partial
tests/ref/fate/deluxepaint-anm
tests/ref/fate/dfa1
tests/ref/fate/dfa10
tests/ref/fate/dfa11
tests/ref/fate/dfa2
tests/ref/fate/dfa3
tests/ref/fate/dfa4
tests/ref/fate/dfa5
tests/ref/fate/dfa6
tests/ref/fate/dfa7
tests/ref/fate/dfa8
tests/ref/fate/dfa9
tests/ref/fate/film-cvid-pcm-stereo-8bit
tests/ref/fate/flic-af11-palette-change
tests/ref/fate/flic-magiccarpet
tests/ref/fate/fraps-v2
tests/ref/fate/fraps-v3
tests/ref/fate/h264-lossless
tests/ref/fate/interplay-mve-16bit
tests/ref/fate/interplay-mve-8bit
tests/ref/fate/mimic
tests/ref/fate/motionpixels
tests/ref/fate/mpeg2-field-enc
tests/ref/fate/msvideo1-16bit
tests/ref/fate/mtv
tests/ref/fate/nuv
tests/ref/fate/pictor
tests/ref/fate/prores-alpha
tests/ref/fate/ptx
tests/ref/fate/qtrle-16bit
tests/ref/fate/qtrle-1bit
tests/ref/fate/quickdraw
tests/ref/fate/rpza
tests/ref/fate/sierra-vmd
tests/ref/fate/targa-conformance-CCM8
tests/ref/fate/targa-conformance-UCM8
tests/ref/fate/tiertex-seq
tests/ref/fate/truemotion1-15
tests/ref/fate/truemotion1-24
tests/ref/fate/tscc-15bit
tests/ref/fate/tscc-32bit
tests/ref/fate/v210
tests/ref/fate/vc1-ism
tests/ref/fate/vc1_sa00040
tests/ref/fate/vc1_sa00050
tests/ref/fate/vc1_sa10091
tests/ref/fate/vc1_sa20021
tests/ref/fate/vmnc-16bit
tests/ref/fate/vmnc-32bit
tests/ref/fate/vp5
tests/ref/fate/vp8-sign-bias
tests/ref/fate/vqa-cc
tests/ref/fate/wmv8-drm
tests/ref/fate/yop
tests/ref/fate/zmbv-8bit

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoapedec: remove unused variable
Michael Niedermayer [Sat, 4 Feb 2012 00:01:56 +0000 (01:01 +0100)]
apedec: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agozmbv: remove unused variable
Michael Niedermayer [Fri, 3 Feb 2012 23:44:15 +0000 (00:44 +0100)]
zmbv: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix png decoding on x86.
Reimar Döffinger [Fri, 3 Feb 2012 20:23:49 +0000 (21:23 +0100)]
Fix png decoding on x86.

Line sizes are only 8-byte aligned, so use unaliged loads
for add_bytes_l2 pointers.
Increasing the alignment requirement to 16 seemed a bit extreme
(png may be used for rather small sizes).
Also fix a mov that had its arguments swapped, leading
add_bytes_l2 being applied on up to 8 bytes too few.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agodsputil: remove debug message in dsputil_init().
Justin Ruggles [Wed, 10 Aug 2011 13:39:43 +0000 (09:39 -0400)]
dsputil: remove debug message in dsputil_init().

AVCodecContext.bits_per_raw_sample is used for audio too, and values other
than 8, 9, and 10 are valid.

7 years agoFix NASM compilation.
Reimar Döffinger [Fri, 3 Feb 2012 19:34:56 +0000 (20:34 +0100)]
Fix NASM compilation.

movd needs explicit register size prefix for NASM.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoRemove some warnings when compiling with mingw (mingw-w64, 32 bits)
Vincent Torri [Sun, 29 Jan 2012 09:45:22 +0000 (10:45 +0100)]
Remove some warnings when compiling with mingw (mingw-w64, 32 bits)

Reviewed-by: Ramiro Polla <ramiro.polla@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomovdec: Avoid av_malloc(0) in stss
Alex Converse [Fri, 3 Feb 2012 18:43:21 +0000 (10:43 -0800)]
movdec: Avoid av_malloc(0) in stss

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
7 years agodshow: use DirectShow information to set time_base
Ramiro Polla [Fri, 3 Feb 2012 16:55:20 +0000 (14:55 -0200)]
dshow: use DirectShow information to set time_base

Fixes build after removal of AVFormatParameters.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodshow: fix AVInputFormat declaration after ABI breakage
Ramiro Polla [Fri, 3 Feb 2012 16:50:19 +0000 (14:50 -0200)]
dshow: fix AVInputFormat declaration after ABI breakage

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: Drop YASM-OBJS-FFT from SUBDIR_VARS.
Diego Biurrun [Thu, 2 Feb 2012 22:39:23 +0000 (23:39 +0100)]
build: Drop YASM-OBJS-FFT from SUBDIR_VARS.

FFT code only appears in libavcodec, so there is no need to reset the variable
when the build templates are instantiated for other libraries.

7 years agobuild: Drop unused X86-OBJS variable.
Diego Biurrun [Thu, 2 Feb 2012 22:37:30 +0000 (23:37 +0100)]
build: Drop unused X86-OBJS variable.

7 years agoavconv: remove debugging cruft from do_video_out().
Anton Khirnov [Wed, 1 Feb 2012 09:25:19 +0000 (10:25 +0100)]
avconv: remove debugging cruft from do_video_out().

7 years agoavconv: factorize setting stream_index for the output packet.
Anton Khirnov [Wed, 1 Feb 2012 09:23:28 +0000 (10:23 +0100)]
avconv: factorize setting stream_index for the output packet.

7 years agoframe{crc/md5}: set the stream timebase from codec timebase.
Anton Khirnov [Thu, 2 Feb 2012 13:20:43 +0000 (14:20 +0100)]
frame{crc/md5}: set the stream timebase from codec timebase.

Right now those muxers use the default timebase in all cases(1/90000).

This patch avoid unnecessary rescaling and makes the printed timestamps
more readable.

Also, extend the printed information to include the timebases and packet
pts/duration and align the columns.

Obviously changes the results of all fate tests which use those two
muxers.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 3 Feb 2012 01:41:47 +0000 (02:41 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx264: fix indentation.
  vorbis: fix overflows in floor1[] vector and inverse db table index.
  win64: add a XMM clobber test configure option.
  movdec: Parse the dvc1 atom
  ARM: ac3: fix ac3_bit_alloc_calc_bap_armv6
  swscale: K&R formatting cosmetics for Blackfin code
  frwu: lowercase the FRWU codec name
  movdec: fix dts generation in fragmented files
  fate: make acodec-ac3_fixed test output raw AC3
  APIchanges: add missing commit hashes
  swscale: implement MMX, SSE2 and AVX functions for RGB32 input.
  ra144enc: drop pointless "encoder" from .long_name
  bethsoftvideo: fix palette reading.
  mpc7: use av_fast_padded_malloc()
  mpc7: simplify handling of packet sizes that are not a multiple of 4 bytes
  doc: decoding Forward Uncompressed is supported
  Fix a typo in the x86 asm version of ff_vector_clip_int32()
  pcmenc: Do not set avpkt->size.
  ff_alloc_packet: modify the size of the packet to match the requested size

Conflicts:
doc/APIchanges
libavcodec/libx264.c
libavcodec/mpc7.c
libavformat/isom.h
libswscale/Makefile
libswscale/bfin/yuv2rgb_bfin.c
tests/ref/fate/bethsoft-vid
tests/ref/seek/ac3_ac3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoapedec: remove unneeded #include of get_bits.h and associated macro
Justin Ruggles [Thu, 2 Feb 2012 01:14:42 +0000 (20:14 -0500)]
apedec: remove unneeded #include of get_bits.h and associated macro

7 years agoapedec: av_fast_malloc() instead of av_realloc()
Justin Ruggles [Mon, 30 Jan 2012 19:57:21 +0000 (14:57 -0500)]
apedec: av_fast_malloc() instead of av_realloc()

av_realloc() does not guarantee alignment, which is required for
DSPContext.bswap_buf().

7 years agoapedec: fix handling of packet sizes that are not a multiple of 4 bytes
Justin Ruggles [Thu, 2 Feb 2012 01:11:36 +0000 (20:11 -0500)]
apedec: fix handling of packet sizes that are not a multiple of 4 bytes

7 years agolavu/timecode: use @see for URL in doxygen.
Clément Bœsch [Thu, 2 Feb 2012 23:56:27 +0000 (00:56 +0100)]
lavu/timecode: use @see for URL in doxygen.

7 years agolavfi/thumbnail: rename @url to @see.
Clément Bœsch [Thu, 2 Feb 2012 23:55:37 +0000 (00:55 +0100)]
lavfi/thumbnail: rename @url to @see.

@url isn't a valid Doxygen directive.

7 years agolibx264: fix indentation.
Anton Khirnov [Wed, 1 Feb 2012 09:56:14 +0000 (10:56 +0100)]
libx264: fix indentation.

7 years agoUse SECTION_TEXT instead of section .text for the compatibility
KO Myung-Hun [Thu, 2 Feb 2012 06:29:39 +0000 (15:29 +0900)]
Use SECTION_TEXT instead of section .text for the compatibility

aout does not support 'align='.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1: cosmetics: indentation
Paul B Mahol [Thu, 2 Feb 2012 17:49:10 +0000 (17:49 +0000)]
ffv1: cosmetics: indentation

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovorbis: fix overflows in floor1[] vector and inverse db table index.
Ronald S. Bultje [Wed, 11 Jan 2012 01:01:26 +0000 (17:01 -0800)]
vorbis: fix overflows in floor1[] vector and inverse db table index.

7 years agowin64: add a XMM clobber test configure option.
Ronald S. Bultje [Thu, 2 Feb 2012 19:48:13 +0000 (11:48 -0800)]
win64: add a XMM clobber test configure option.

This will be useful to test more aggressively for failures to mark XMM
registers as clobbered in Win64 builds, and prevent regressions thereof.

Based on a patch by Ramiro Polla <ramiro.polla@gmail.com>

7 years agodct-test: remove odivx_idct_c dead prototype.
Clément Bœsch [Thu, 2 Feb 2012 19:15:17 +0000 (20:15 +0100)]
dct-test: remove odivx_idct_c dead prototype.

7 years agomovdec: Parse the dvc1 atom
Martin Storsjö [Sat, 21 Jan 2012 23:32:16 +0000 (01:32 +0200)]
movdec: Parse the dvc1 atom

Normally, the actual payload data contains sequence headers, too,
and the parser can extract this and set it as extradata. However,
the data in the dvc1 atom is the "official" extradata for the file.

This is required for proper stream copy of vc1 from ismv to ismv.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoARM: ac3: fix ac3_bit_alloc_calc_bap_armv6
Mans Rullgard [Wed, 1 Feb 2012 22:25:10 +0000 (22:25 +0000)]
ARM: ac3: fix ac3_bit_alloc_calc_bap_armv6

This function was broken when the start bin was not at the start
of a band.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoswscale: K&R formatting cosmetics for Blackfin code
Diego Biurrun [Wed, 18 Jan 2012 22:56:49 +0000 (23:56 +0100)]
swscale: K&R formatting cosmetics for Blackfin code

Also prettyprint some comments in Assembly code.

7 years agofrwu: lowercase the FRWU codec name
Piotr Bandurski [Wed, 1 Feb 2012 20:23:33 +0000 (20:23 +0000)]
frwu: lowercase the FRWU codec name

This is more consistent with all the other codec names.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoCosmentics: Fix AVUI comment.
Carl Eugen Hoyos [Thu, 2 Feb 2012 17:44:39 +0000 (18:44 +0100)]
Cosmentics: Fix AVUI comment.

The codec contains no alpha information but deinterleaved interlaced video.

Found by Maksym Veremeyenko.

7 years agomovdec: fix dts generation in fragmented files
Janne Grunau [Thu, 2 Feb 2012 15:30:27 +0000 (16:30 +0100)]
movdec: fix dts generation in fragmented files

Do not use AVStream's duration for dts generation since it contains in
some cases the duration of the whole file instead of duration of the
samples in the moov. This happens if the mdhd holds the duration of the
whole file but has no entries or a zero duration in its stts.

7 years agofate: make acodec-ac3_fixed test output raw AC3
Mans Rullgard [Thu, 2 Feb 2012 01:46:05 +0000 (01:46 +0000)]
fate: make acodec-ac3_fixed test output raw AC3

There is no point in this test using the RM format.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agolavfi/amerge: copy ref props after filtering samples.
Clément Bœsch [Wed, 1 Feb 2012 14:53:54 +0000 (15:53 +0100)]
lavfi/amerge: copy ref props after filtering samples.

This fixes various issues with ffmpeg -ss and -t.

7 years agolavfi/pan: copy ref props after filtering samples.
Clément Bœsch [Tue, 31 Jan 2012 07:20:42 +0000 (08:20 +0100)]
lavfi/pan: copy ref props after filtering samples.

At least PTS needs to be copied to avoid breaking options such as -t in
ffmpeg.

7 years agolavfi/aconvert: use libswresample.
Clément Bœsch [Thu, 26 Jan 2012 07:49:15 +0000 (08:49 +0100)]
lavfi/aconvert: use libswresample.

This commit also drops the planar parameter; you now need to use the 'p'
suffix in order to request a planar sample format.

7 years agolavfi/aresample: use libswresample.
Clément Bœsch [Sat, 21 Jan 2012 19:26:31 +0000 (20:26 +0100)]
lavfi/aresample: use libswresample.

7 years agolavfi/aformat: use do..while(0) form for macro.
Clément Bœsch [Thu, 26 Jan 2012 08:43:17 +0000 (09:43 +0100)]
lavfi/aformat: use do..while(0) form for macro.

This avoids some empty statements.

7 years agodoc: document amerge filter as an alternative for the -map_channel limitation.
Clément Bœsch [Tue, 10 Jan 2012 10:47:46 +0000 (11:47 +0100)]
doc: document amerge filter as an alternative for the -map_channel limitation.

7 years agotimecode: drop lavc timecode on next bump.
Clément Bœsch [Mon, 16 Jan 2012 16:04:04 +0000 (17:04 +0100)]
timecode: drop lavc timecode on next bump.

7 years agodvenc: use new public timecode API.
Clément Bœsch [Mon, 16 Jan 2012 12:43:42 +0000 (13:43 +0100)]
dvenc: use new public timecode API.

7 years agomxfenc: use new public timecode API.
Clément Bœsch [Mon, 16 Jan 2012 13:19:37 +0000 (14:19 +0100)]
mxfenc: use new public timecode API.

7 years agogxfenc: use new public timecode API.
Clément Bœsch [Mon, 16 Jan 2012 15:10:22 +0000 (16:10 +0100)]
gxfenc: use new public timecode API.