ffmpeg.git
7 years agoconfigure: produce useful uninstalled pc files.
Nicolas George [Thu, 10 May 2012 07:53:36 +0000 (09:53 +0200)]
configure: produce useful uninstalled pc files.

The old files were scattered in several directories,
with an unusual name, but dependencies to the usual name,
and relative paths.

The new files are regrouped in a singled directory
(doc/examples/pc-uninstalled) with their usual name
and more absolute paths.

With this change, it becomes possible to compile the examples
with the ffmpeg build tree by setting the environment variable:
PKG_CONFIG_PATH=pc-uninstalled

7 years agoexr: cache some values
Paul B Mahol [Wed, 11 Jul 2012 20:40:23 +0000 (20:40 +0000)]
exr: cache some values

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agodca: map xxch side channels to AV_CH_SIDE_LEFT/RIGHT instead of REAR.
Hendrik Leppkes [Sun, 8 Jul 2012 18:11:27 +0000 (20:11 +0200)]
dca: map xxch side channels to AV_CH_SIDE_LEFT/RIGHT instead of REAR.

This fixes decoding of certain 7.1 DTS-HD HRA files, as well as matches the spec better.
Table 6-22 in the DTS spec labels the two channels "Left/Right surround on side", and not rear.

Reviewed-by: Benjamin Larsson <benjamin@southpole.se>
Reviewed-by: Nick Brereton <nick@nbrereton.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 11 Jul 2012 21:56:02 +0000 (23:56 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Check for the math function rint
  TechSmith Screen Codec 2 decoder
  rtsp: Add listen mode
  rtsp: Make rtsp_open_transport_ctx() non-static
  rtsp: Move rtsp_read_close
  rtsp: Parse the mode=receive/record parameter in transport lines

Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/version.h
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovorbisdec: switch to av_assert
Michael Niedermayer [Wed, 11 Jul 2012 21:24:23 +0000 (23:24 +0200)]
vorbisdec: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavidec: switch to av_assert
Michael Niedermayer [Wed, 11 Jul 2012 20:13:24 +0000 (22:13 +0200)]
avidec: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoexr: zip decompression
Paul B Mahol [Sun, 8 Jul 2012 00:04:46 +0000 (00:04 +0000)]
exr: zip decompression

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoexr: remove dead assigment
Paul B Mahol [Wed, 11 Jul 2012 20:43:37 +0000 (20:43 +0000)]
exr: remove dead assigment

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoconfigure: Check for the math function rint
Ronald S. Bultje [Tue, 26 Jun 2012 12:05:28 +0000 (15:05 +0300)]
configure: Check for the math function rint

Add a fallback implementation if it doesn't exist.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoTechSmith Screen Codec 2 decoder
Kostya Shishkov [Sun, 8 Jul 2012 17:51:08 +0000 (19:51 +0200)]
TechSmith Screen Codec 2 decoder

7 years agoreplace all __volatile__ by volatile
Michael Niedermayer [Wed, 11 Jul 2012 01:50:34 +0000 (03:50 +0200)]
replace all __volatile__ by volatile

__volatile__ can cause problems with some compilers and volatile is a standard keyword.

Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/mxfenc: fix dnxhd codec uls and aspect ratio
Matthieu Bouron [Mon, 9 Jul 2012 17:29:42 +0000 (19:29 +0200)]
lavf/mxfenc: fix dnxhd codec uls and aspect ratio

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotiffenc: use av_fast_padded_malloc(z)
Paul B Mahol [Tue, 10 Jul 2012 03:01:19 +0000 (03:01 +0000)]
tiffenc: use av_fast_padded_malloc(z)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavc: add av_fast_padded_mallocz
Paul B Mahol [Tue, 10 Jul 2012 03:49:44 +0000 (03:49 +0000)]
lavc: add av_fast_padded_mallocz

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agotiffenc: add .init
Paul B Mahol [Tue, 10 Jul 2012 02:40:39 +0000 (02:40 +0000)]
tiffenc: add .init

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoparseutils: ignore digits below the microsecond.
Nicolas George [Tue, 10 Jul 2012 17:03:12 +0000 (19:03 +0200)]
parseutils: ignore digits below the microsecond.

Accept 1.1234567 as simply 1.123456 instead of rejecting it.
The rounding is towards 0, which is acceptable and much simpler.

7 years agortsp: Add listen mode
Jordi Ortiz [Tue, 10 Jul 2012 17:36:11 +0000 (19:36 +0200)]
rtsp: Add listen mode

This makes the RTSP demuxer act as a server, listening for an
incoming connection.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 10 Jul 2012 18:51:51 +0000 (20:51 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mss1: fix decoding masked regions in interframes
  mxfdec: fix off by one error.
  mxfdec: only parse next partition pack if parsing forward
  mxfdec: let pkt->pts = mxf->current_edit_unit if intra-only
  mxfdec: fix frame height vs field height confusion
  mxfdec: Add intra_only flag to MXFTrack
  mxfdec: fix Avid AirSpeed files being misinterpreted as OP1a
  mxfdec: truncate packets that extend past the next edit unit
  mxfdec: set pixel format for cdci picture formats
  mxfdec: detect uncomp pictures using essence container ul
  mxfdec: set track edit rate num/den in expected order
  x86/cpu: implement get/set_eflags using intrinsics
  x86/cpu: implement support for cpuid through intrinsics
  x86/cpu: implement support for xgetbv through intrinsics
  lavu: use intrinsics for emms on systems lacking inline asm support
  mem: Don't abort on av_malloc(0) in debug mode

Conflicts:
configure
libavformat/mxf.h
libavformat/mxfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: cpu: clean up check for cpuid instruction support
Mans Rullgard [Sun, 24 Jun 2012 11:29:28 +0000 (12:29 +0100)]
x86: cpu: clean up check for cpuid instruction support

This adds macros for accessing the EFLAGS register and uses
these instead of coding the entire check in inline asm.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoconfigure: Change the rdtsc check to a linker check
Diego Biurrun [Sun, 8 Jul 2012 23:24:37 +0000 (01:24 +0200)]
configure: Change the rdtsc check to a linker check

A compile-only test could succeed with an implicit function declaration.
Also move the check to the x86 section; rdtsc is x86-only.

7 years agortsp: Make rtsp_open_transport_ctx() non-static
Jordi Ortiz [Tue, 10 Jul 2012 17:25:04 +0000 (19:25 +0200)]
rtsp: Make rtsp_open_transport_ctx() non-static

This is required for the upcoming RTSP listen mode.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortsp: Move rtsp_read_close
Jordi Ortiz [Wed, 4 Jul 2012 20:13:40 +0000 (22:13 +0200)]
rtsp: Move rtsp_read_close

This avoids having to add forward declarations in the following
RTSP listen mode commit.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortsp: Parse the mode=receive/record parameter in transport lines
Jordi Ortiz [Tue, 10 Jul 2012 17:21:58 +0000 (19:21 +0200)]
rtsp: Parse the mode=receive/record parameter in transport lines

We need to support the nonstandard mode=receive, for compatibility
with older libavformat clients.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agompeg4videoenc: use av_assert
Michael Niedermayer [Tue, 10 Jul 2012 17:37:53 +0000 (19:37 +0200)]
mpeg4videoenc: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg4videodec: use av_assert
Michael Niedermayer [Tue, 10 Jul 2012 17:37:37 +0000 (19:37 +0200)]
mpeg4videodec: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodpx: invalid aspect ratio is 0/1, not 0/0.
Nicolas George [Mon, 9 Jul 2012 07:13:21 +0000 (09:13 +0200)]
dpx: invalid aspect ratio is 0/1, not 0/0.

7 years agoSet default ffv1 coder to -1.
Carl Eugen Hoyos [Tue, 10 Jul 2012 12:29:10 +0000 (14:29 +0200)]
Set default ffv1 coder to -1.

Autoselect coder 1 instead of default coder if bits_per_raw_sample > 8.

Fixes ticket #1519.

7 years agoCosmetics: Return AVERROR_INVALIDDATA from ffv1 encoder initialisation if invalid...
Carl Eugen Hoyos [Tue, 10 Jul 2012 12:24:47 +0000 (14:24 +0200)]
Cosmetics: Return AVERROR_INVALIDDATA from ffv1 encoder initialisation if invalid data was provided.

7 years agoCosmetics: Move ffv1 encoder initialisation code.
Carl Eugen Hoyos [Tue, 10 Jul 2012 12:21:29 +0000 (14:21 +0200)]
Cosmetics: Move ffv1 encoder initialisation code.

7 years agodsputil: turn assert into if() as its possible to trigger with ffv1
Michael Niedermayer [Tue, 10 Jul 2012 12:21:06 +0000 (14:21 +0200)]
dsputil: turn assert into if() as its possible to trigger with ffv1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomss1: fix decoding masked regions in interframes
Kostya Shishkov [Tue, 10 Jul 2012 11:38:56 +0000 (13:38 +0200)]
mss1: fix decoding masked regions in interframes

Spotted by Alberto Delmás

7 years agomxfdec: fix off by one error.
Michael Niedermayer [Mon, 26 Mar 2012 13:05:02 +0000 (15:05 +0200)]
mxfdec: fix off by one error.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agomxfdec: only parse next partition pack if parsing forward
Tomas Härdin [Tue, 20 Mar 2012 10:03:48 +0000 (11:03 +0100)]
mxfdec: only parse next partition pack if parsing forward

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agomxfdec: let pkt->pts = mxf->current_edit_unit if intra-only
Tomas Härdin [Wed, 7 Mar 2012 09:03:16 +0000 (10:03 +0100)]
mxfdec: let pkt->pts = mxf->current_edit_unit if intra-only

We cannot do this in general since we could be reading
a file with B-frames while lacking an index.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agomxfdec: fix frame height vs field height confusion
Joseph Artsimovich [Tue, 7 Feb 2012 10:48:43 +0000 (10:48 +0000)]
mxfdec: fix frame height vs field height confusion

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Reveiwed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agomxfdec: Add intra_only flag to MXFTrack
Tomas Härdin [Wed, 7 Mar 2012 09:52:39 +0000 (10:52 +0100)]
mxfdec: Add intra_only flag to MXFTrack

This allows future assumptions to be made without affecting non-intra files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agomxfdec: fix Avid AirSpeed files being misinterpreted as OP1a
Tomas Härdin [Fri, 2 Mar 2012 10:33:28 +0000 (11:33 +0100)]
mxfdec: fix Avid AirSpeed files being misinterpreted as OP1a

The "ECs != 1 -> OP1a" assumption was wrong. Luckily, the file
that triggered that behavior had two ECs, not zero. Hence
distinguishing between them is simple in this case.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agomxfdec: truncate packets that extend past the next edit unit
Tomas Härdin [Fri, 2 Mar 2012 10:16:10 +0000 (11:16 +0100)]
mxfdec: truncate packets that extend past the next edit unit

This fixes rare cases where OPAtom may be treated
as OP1a, causing all essence to be read into RAM.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agomxfdec: set pixel format for cdci picture formats
Philip de Nier [Tue, 28 Feb 2012 14:16:39 +0000 (14:16 +0000)]
mxfdec: set pixel format for cdci picture formats

The properties of the CDCI Descriptor are insufficient to specify
the pixel format for uncompressed picture data. SMPTE 377-1 and
RP224v10 have defined a set of picture coding labels to indicate what
formatting was used.

This patch uses 2 labels to detect UYVY422 or YUYV422 pixel formats.

It defaults to UYVY422 for 8-bit 4:2:2 pictures to support files
that were created before the coding labels were introduced ~2008

The codec pix_fmt default was changed from 0 (PIX_FMT_YUV420P) to
-1 (PIX_FMT_NONE)

Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomxfdec: detect uncomp pictures using essence container ul
Philip de Nier [Tue, 28 Feb 2012 14:16:38 +0000 (14:16 +0000)]
mxfdec: detect uncomp pictures using essence container ul

This supports detection of uncompressed picture in files that
didn't include a Picture Coding Label. The lables weren't
available until SMPTE 377-1 and RP224v10

Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agomxfdec: set track edit rate num/den in expected order
Philip de Nier [Tue, 28 Feb 2012 14:16:36 +0000 (14:16 +0000)]
mxfdec: set track edit rate num/den in expected order

This matches the order used for the index table edit rate.

Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agox86/cpu: implement get/set_eflags using intrinsics
Ronald S. Bultje [Mon, 9 Jul 2012 00:21:28 +0000 (02:21 +0200)]
x86/cpu: implement get/set_eflags using intrinsics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agox86/cpu: implement support for cpuid through intrinsics
Ronald S. Bultje [Mon, 9 Jul 2012 00:21:27 +0000 (02:21 +0200)]
x86/cpu: implement support for cpuid through intrinsics

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agox86/cpu: implement support for xgetbv through intrinsics
Ronald S. Bultje [Mon, 9 Jul 2012 00:21:26 +0000 (02:21 +0200)]
x86/cpu: implement support for xgetbv through intrinsics

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolavu: use intrinsics for emms on systems lacking inline asm support
Ronald S. Bultje [Mon, 9 Jul 2012 00:21:25 +0000 (02:21 +0200)]
lavu: use intrinsics for emms on systems lacking inline asm support

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoRecognize yuv10 image files as v210x.
Carl Eugen Hoyos [Tue, 10 Jul 2012 11:27:16 +0000 (13:27 +0200)]
Recognize yuv10 image files as v210x.

Reviewed-by: Kieran Kunhya
7 years agoDefine snow .pix_fmts to allow colour space auto-selection.
Carl Eugen Hoyos [Tue, 10 Jul 2012 11:22:01 +0000 (13:22 +0200)]
Define snow .pix_fmts to allow colour space auto-selection.

7 years agomem: Don't abort on av_malloc(0) in debug mode
Martin Storsjö [Wed, 11 Apr 2012 07:33:43 +0000 (10:33 +0300)]
mem: Don't abort on av_malloc(0) in debug mode

This makes the behaviour consistent between debug and release mode.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoexr: return proper error code instead of -1
Paul B Mahol [Tue, 10 Jul 2012 01:27:40 +0000 (01:27 +0000)]
exr: return proper error code instead of -1

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoexr: use buf_size instead of recalculating same value
Paul B Mahol [Tue, 10 Jul 2012 01:20:13 +0000 (01:20 +0000)]
exr: use buf_size instead of recalculating same value

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoh264/decode_scaling_matrices: fix coding order of 8x8 matrixes.
Michael Niedermayer [Mon, 9 Jul 2012 23:04:36 +0000 (01:04 +0200)]
h264/decode_scaling_matrices: fix coding order of 8x8 matrixes.

This fixes decoding of PPCV444I3_Thomson_A.bits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: 12 and 14 bit support
Michael Niedermayer [Wed, 4 Jul 2012 23:35:02 +0000 (01:35 +0200)]
h264: 12 and 14 bit support

This works with I, P and B frames
CAVLC and CABAC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264dsp: 12 and 14 bit support
Michael Niedermayer [Wed, 4 Jul 2012 23:34:12 +0000 (01:34 +0200)]
h264dsp: 12 and 14 bit support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264pred: 12 and 14 bit support
Michael Niedermayer [Wed, 4 Jul 2012 23:33:51 +0000 (01:33 +0200)]
h264pred: 12 and 14 bit support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264idct: 12 and 14 bit support
Michael Niedermayer [Wed, 4 Jul 2012 23:33:18 +0000 (01:33 +0200)]
h264idct: 12 and 14 bit support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: limit 10bpp MC pading trick to 10bpp
Michael Niedermayer [Thu, 5 Jul 2012 17:13:40 +0000 (19:13 +0200)]
h264: limit 10bpp MC pading trick to 10bpp

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodsputil: extend things to 12 and 14 bits
Michael Niedermayer [Wed, 4 Jul 2012 23:32:13 +0000 (01:32 +0200)]
dsputil: extend things to 12 and 14 bits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: add test for paf demuxer
Paul B Mahol [Sun, 8 Jul 2012 20:34:19 +0000 (20:34 +0000)]
fate: add test for paf demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agofate: add test for paf video decoder
Paul B Mahol [Sun, 8 Jul 2012 20:18:27 +0000 (20:18 +0000)]
fate: add test for paf video decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agofate: add test for paf audio decoder
Paul B Mahol [Sun, 8 Jul 2012 20:16:12 +0000 (20:16 +0000)]
fate: add test for paf audio decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/movie: reindent after the previous patch
Steven Robertson [Sat, 7 Jul 2012 05:42:29 +0000 (22:42 -0700)]
lavfi/movie: reindent after the previous patch

Signed-off-by: Steven Robertson <steven@strobe.cc>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agolavfi/movie: flush decoder frames on EOF
Steven Robertson [Sat, 7 Jul 2012 05:41:28 +0000 (22:41 -0700)]
lavfi/movie: flush decoder frames on EOF

movie currently forwards EOF (or begins looping) immediately upon
reaching the last packet in the input stream, which can leave frames in
the decoder. This change first tries to read any remaining packets from
the decoder before forwarding EOF.

Signed-off-by: Steven Robertson <steven@strobe.cc>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agolavfi/buffersink: restore possibility to pass opaque data
Stefano Sabatini [Thu, 5 Jul 2012 23:06:20 +0000 (01:06 +0200)]
lavfi/buffersink: restore possibility to pass opaque data

Use the init_opaque callback for the purpose.

Fix regression introduced in a5e8c41c28f. In particular, fix lavfi
device in case a conversion to the supported (packed) formats is needed.

7 years agolavfi: add init_opaque callback
Stefano Sabatini [Thu, 5 Jul 2012 22:41:27 +0000 (00:41 +0200)]
lavfi: add init_opaque callback

This will be used by filters which require an opaque field to be passed
in input. Should be required only for filters which imply a programmatic
use.

This is possibly a temporary solution, to be removed when we'll have a
clearer and better agreememnt of how/if to pass binary data for
initializing a filter.

See thread:
Subject: [FFmpeg-devel][PATCH] lavfi: add init2 callback
Date: Fri,  6 Jul 2012 01:22:17 +0200

7 years agolavf/segment: add -segment_time_delta option
Stefano Sabatini [Sat, 28 Jan 2012 21:21:43 +0000 (22:21 +0100)]
lavf/segment: add -segment_time_delta option

7 years agolavf/segment: add -segment_times option
Stefano Sabatini [Sat, 28 Jan 2012 21:36:38 +0000 (22:36 +0100)]
lavf/segment: add -segment_times option

Address trac ticket #1504.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 9 Jul 2012 20:10:38 +0000 (22:10 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mss3: use standard zigzag table
  mss3: split DSP functions that are used in MTS2(MSS4) into separate file
  motion-test: do not use getopt()
  tcp: add initial timeout limit for incoming connections
  configure: Change the rdtsc check to a linker check
  avconv: propagate fatal errors from lavfi.
  lavfi: add error handling to filter_samples().
  fate-run: make avconv() properly deal with multiple inputs.
  asplit: don't leak the input buffer.
  af_resample: fix request_frame() behavior.
  af_asyncts: fix request_frame() behavior.
  libx264: support aspect ratio switching
  matroskadec: honor error_recognition when encountering unknown elements.
  lavr: resampling: add support for s32p, fltp, and dblp internal sample formats
  lavr: resampling: add filter type and Kaiser window beta to AVOptions
  lavr: Use AV_SAMPLE_FMT_NONE to auto-select the internal sample format
  lavr: mix: validate internal sample format in ff_audio_mix_init()

Conflicts:
ffmpeg.c
ffplay.c
libavcodec/libx264.c
libavfilter/audio.c
libavfilter/split.c
libavformat/tcp.c
tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomss3: use standard zigzag table
Kostya Shishkov [Mon, 9 Jul 2012 16:15:27 +0000 (18:15 +0200)]
mss3: use standard zigzag table

7 years agomss3: split DSP functions that are used in MTS2(MSS4) into separate file
Kostya Shishkov [Mon, 9 Jul 2012 05:55:12 +0000 (07:55 +0200)]
mss3: split DSP functions that are used in MTS2(MSS4) into separate file

7 years agomotion-test: do not use getopt()
Anton Khirnov [Mon, 9 Jul 2012 06:15:34 +0000 (08:15 +0200)]
motion-test: do not use getopt()

It is not available on all systems and using argc/argv directly actually
makes the code simpler.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agotcp: add initial timeout limit for incoming connections
Jordi Ortiz [Wed, 4 Jul 2012 15:48:10 +0000 (17:48 +0200)]
tcp: add initial timeout limit for incoming connections

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agompeg12: switch to av_assert
Michael Niedermayer [Mon, 9 Jul 2012 13:38:28 +0000 (15:38 +0200)]
mpeg12: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg12enc: switch to av_assert
Michael Niedermayer [Mon, 9 Jul 2012 13:38:16 +0000 (15:38 +0200)]
mpeg12enc: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomovenc: Addtion of \251cmt field to udta
Al@dneg.com [Mon, 9 Jul 2012 09:40:12 +0000 (10:40 +0100)]
movenc: Addtion of \251cmt field to udta

Allows support of comment in udta for libquicktime, also currently \251des is used
 which is ignored by mov.c.
\251cmt IS currently already picked up by mov.c

References

libquicktime
http://libquicktime.cvs.sourceforge.net/viewvc/libquicktime/libquicktime/src/udta.c?view=markup

Also listed here:
http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/QuickTime.html#UserData

Not listed here, but that`s not entirely surprising, as udta fields are expected to be somewhat arbitary.
http://developer.apple.com/library/mac/#documentation/QuickTime/qtff/QTFFChap2/qtff2.html#//apple_ref/doc/uid/TP40000939-CH204-BBCCFFGD

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoShow hyphen in codec tag.
Carl Eugen Hoyos [Mon, 9 Jul 2012 11:46:55 +0000 (13:46 +0200)]
Show hyphen in codec tag.

7 years agoconfigure: Change the rdtsc check to a linker check
Diego Biurrun [Sun, 8 Jul 2012 23:24:37 +0000 (01:24 +0200)]
configure: Change the rdtsc check to a linker check

A compile-only test could succeed with an implicit function declaration.
Also move the check to the x86 section; rdtsc is x86-only.

7 years agoavconv: propagate fatal errors from lavfi.
Anton Khirnov [Tue, 3 Jul 2012 09:44:46 +0000 (11:44 +0200)]
avconv: propagate fatal errors from lavfi.

7 years agolavfi: add error handling to filter_samples().
Anton Khirnov [Mon, 2 Jul 2012 18:13:40 +0000 (20:13 +0200)]
lavfi: add error handling to filter_samples().

7 years agofate-run: make avconv() properly deal with multiple inputs.
Anton Khirnov [Tue, 29 May 2012 09:41:55 +0000 (11:41 +0200)]
fate-run: make avconv() properly deal with multiple inputs.

7 years agoasplit: don't leak the input buffer.
Anton Khirnov [Tue, 3 Jul 2012 09:26:45 +0000 (11:26 +0200)]
asplit: don't leak the input buffer.

7 years agoaf_resample: fix request_frame() behavior.
Anton Khirnov [Wed, 4 Jul 2012 14:46:17 +0000 (16:46 +0200)]
af_resample: fix request_frame() behavior.

Make sure that an output frame has really been produced before returning
0.

7 years agoaf_asyncts: fix request_frame() behavior.
Anton Khirnov [Wed, 4 Jul 2012 14:46:17 +0000 (16:46 +0200)]
af_asyncts: fix request_frame() behavior.

Make sure that an output frame has really been produced before returning
0.

7 years agolibx264: support aspect ratio switching
JULIAN GARDNER [Sun, 8 Jul 2012 14:33:47 +0000 (17:33 +0300)]
libx264: support aspect ratio switching

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agomatroskadec: honor error_recognition when encountering unknown elements.
Anton Khirnov [Sat, 7 Jul 2012 15:15:27 +0000 (17:15 +0200)]
matroskadec: honor error_recognition when encountering unknown elements.

7 years agoexr: support for reading pixelAspectRatio
Paul B Mahol [Mon, 9 Jul 2012 00:51:22 +0000 (00:51 +0000)]
exr: support for reading pixelAspectRatio

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agotiffenc: PIX_FMT_YUV440P support
Paul B Mahol [Mon, 9 Jul 2012 01:55:16 +0000 (01:55 +0000)]
tiffenc: PIX_FMT_YUV440P support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosgidec: add CODEC_CAP_DR1
Paul B Mahol [Sun, 8 Jul 2012 23:41:41 +0000 (23:41 +0000)]
sgidec: add CODEC_CAP_DR1

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosgidec: remove redundant argument from read_uncompressed_sgi()
Paul B Mahol [Sun, 8 Jul 2012 23:28:16 +0000 (23:28 +0000)]
sgidec: remove redundant argument from read_uncompressed_sgi()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agog723_1: add CODEC_CAP_DR1
Paul B Mahol [Sat, 7 Jul 2012 21:05:51 +0000 (21:05 +0000)]
g723_1: add CODEC_CAP_DR1

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoexr: add CODEC_CAP_DR1
Paul B Mahol [Sat, 7 Jul 2012 20:58:33 +0000 (20:58 +0000)]
exr: add CODEC_CAP_DR1

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agodpx: add CODEC_CAP_DR1
Paul B Mahol [Sat, 7 Jul 2012 20:02:20 +0000 (20:02 +0000)]
dpx: add CODEC_CAP_DR1

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosgidec: fix off by 1 error that tested a sample too far for oob.
Michael Niedermayer [Sun, 8 Jul 2012 23:31:41 +0000 (01:31 +0200)]
sgidec: fix off by 1 error that tested a sample too far for oob.

This led to decoding failure when linesize was too small.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosmush: properly flag audio packets
Paul B Mahol [Sun, 8 Jul 2012 20:47:34 +0000 (20:47 +0000)]
smush: properly flag audio packets

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agopaf: properly flag video packets
Paul B Mahol [Sun, 8 Jul 2012 20:35:34 +0000 (20:35 +0000)]
paf: properly flag video packets

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 8 Jul 2012 20:33:32 +0000 (22:33 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cmutils: include shellapi.h on Win32 (for CommandLineToArgvW).
  x86/timer: implement an intrinsic-based version for rdtsc (AV_READ_TIME).
  id3v2: add a mimetype for bmp pictures.
  flacdec: be less strict when parsing attached pictures.
  flacdec: don't create an attached picture stream until we have all information.

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: limit "Adjusting PTS forward" code to video streams
Michael Niedermayer [Sun, 8 Jul 2012 20:18:34 +0000 (22:18 +0200)]
lavf: limit "Adjusting PTS forward" code to video streams

It can end up slightly messing up a series of valid timestamps
after a invalid one.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavr: resampling: add support for s32p, fltp, and dblp internal sample formats
Justin Ruggles [Mon, 28 May 2012 01:44:55 +0000 (21:44 -0400)]
lavr: resampling: add support for s32p, fltp, and dblp internal sample formats

Based partially on implementation by Michael Niedermayer <michaelni@gmx.at> in
libswresample in FFmpeg. See commits:
7f1ae79d38c4edba9dbd31d7bf797e525298ac55
24ab1abfb6d55bf330022df4b10d7aec80b3f116

7 years agolavr: resampling: add filter type and Kaiser window beta to AVOptions
Justin Ruggles [Sat, 26 May 2012 18:50:02 +0000 (14:50 -0400)]
lavr: resampling: add filter type and Kaiser window beta to AVOptions

7 years agolavr: Use AV_SAMPLE_FMT_NONE to auto-select the internal sample format
Justin Ruggles [Fri, 1 Jun 2012 19:19:45 +0000 (15:19 -0400)]
lavr: Use AV_SAMPLE_FMT_NONE to auto-select the internal sample format

Also make this the default value.

7 years agolavr: mix: validate internal sample format in ff_audio_mix_init()
Justin Ruggles [Fri, 1 Jun 2012 19:12:03 +0000 (15:12 -0400)]
lavr: mix: validate internal sample format in ff_audio_mix_init()