ffmpeg.git
6 years agoisom: add "MNG" FourCC
Piotr Bandurski [Sat, 14 Jul 2012 16:42:29 +0000 (18:42 +0200)]
isom: add "MNG" FourCC

sample:

http://www.datafilehost.com/download-92da395c.html

Reviewed-by: compn <tempn@twmi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoexr: make channel_offsets int instead of int8_t
Paul B Mahol [Sat, 14 Jul 2012 22:12:12 +0000 (22:12 +0000)]
exr: make channel_offsets int instead of int8_t

Prior to this change max number of channels for float data which was
going to be correctly decoded was 32, which is rather small
considering that exr allows multiple channel layers.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agocosmetics: reindent after d3abbb1d1
Paul B Mahol [Sun, 15 Jul 2012 02:31:40 +0000 (02:31 +0000)]
cosmetics: reindent after d3abbb1d1

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolibfdk-aacenc: remove redundant log message if ff_alloc_packet2 fails
Paul B Mahol [Sun, 15 Jul 2012 02:19:48 +0000 (02:19 +0000)]
libfdk-aacenc: remove redundant log message if ff_alloc_packet2 fails

The whole point of ff_alloc_packet2 is to not bloat code with
duplicated error messages.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agomss1: improve check if decoded pivot is invalid
Paul B Mahol [Sat, 14 Jul 2012 23:27:21 +0000 (23:27 +0000)]
mss1: improve check if decoded pivot is invalid

The pivot has to lie between 0 and base.
Check of ==base is insufficient.
Thus replace it by a proper check.

Fixes out of array write.

Fixes bug #1531.

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'dwbuiten/master'
Michael Niedermayer [Sun, 15 Jul 2012 01:40:12 +0000 (03:40 +0200)]
Merge remote-tracking branch 'dwbuiten/master'

* dwbuiten/master:
  doc: Remove stray @item from git-howto
  libfdk-aac: Port to ff_alloc_packet2
  doxy: move av_guess_sample_aspect_ratio to correct place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 14 Jul 2012 23:21:05 +0000 (01:21 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  eval: add gt(), gte(), lt() and lte() fate tests
  eval: fix swapping of lt() and lte()
  imgconvert: deprecate avcodec_find_best_pix_fmt()
  imgconvert: add avcodec_find_best_pix_fmt2()
  imgconvert: avoid undefined left shift in avcodec_find_best_pix_fmt

Conflicts:
libavcodec/imgconvert.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomovtextdec: 3GPP TS 26.245 Timed Text Decoder.
Philip Langdale [Sat, 23 Jun 2012 21:11:19 +0000 (14:11 -0700)]
movtextdec: 3GPP TS 26.245 Timed Text Decoder.

This change introduces a basic decoder for 3GPP Timed Text subtitles,
also known as TX3G, Quicktime subtitles, or "movtext" in the existing
code.

This initial change doesn't attempt to parse styling information,
and just reads the plain text of the subtitles. I intend to add
support for styles eventually, but it's challenging due to a lack
of existing players that support them.

Signed-off-by: Philip Langdale <philipl@overt.org>
6 years agomp3enc: add lame tag with start padding info
Michael Niedermayer [Wed, 4 Jul 2012 20:22:18 +0000 (22:22 +0200)]
mp3enc: add lame tag with start padding info

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: add -progress option.
Nicolas George [Sun, 8 Jul 2012 11:03:39 +0000 (13:03 +0200)]
ffmpeg: add -progress option.

It allows to send program-friendly (easy to parse)
progress information to a file or an URL.

6 years agoeval: add gt(), gte(), lt() and lte() fate tests
Janne Grunau [Sat, 14 Jul 2012 11:31:14 +0000 (13:31 +0200)]
eval: add gt(), gte(), lt() and lte() fate tests

6 years agolibx264: list possible presets and tunes.
Nicolas George [Fri, 13 Jul 2012 22:34:50 +0000 (00:34 +0200)]
libx264: list possible presets and tunes.

The values are listed if setting them fails.
Using "-preset help" or "-preset list" have that effect.

6 years agoeval: fix swapping of lt() and lte()
Max Lazarov [Sat, 31 Mar 2012 06:56:56 +0000 (23:56 -0700)]
eval: fix swapping of lt() and lte()

CC: libav-stable@libav.org
6 years agolavc/tiffenc: apply misc doxy fixes
Stefano Sabatini [Tue, 10 Jul 2012 23:24:49 +0000 (01:24 +0200)]
lavc/tiffenc: apply misc doxy fixes

6 years agoffprobe: add frame metadata printing
Stefano Sabatini [Tue, 10 Jul 2012 22:43:53 +0000 (00:43 +0200)]
ffprobe: add frame metadata printing

6 years agolavc/tiff: add GeoTIFF support to the TIFF decoder
Thomas Kühnel [Mon, 3 Oct 2011 22:19:52 +0000 (00:19 +0200)]
lavc/tiff: add GeoTIFF support to the TIFF decoder

Work done for SOCIS 2011.

See thread:
Subject: [libav-devel] [PATCH 2/3] tiff: Add GeoTIFF support to the TIFF decoder
Date: Tue,  4 Oct 2011 00:19:52 +0200

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolavc/avcodec.h: keep avframe_* field setter and getter close
Stefano Sabatini [Wed, 11 Jul 2012 23:32:24 +0000 (01:32 +0200)]
lavc/avcodec.h: keep avframe_* field setter and getter close

Slightly more readable, now that the list is getting longer.

6 years agolavc: add metadata to AVFrame
Thomas Kühnel [Mon, 26 Sep 2011 20:26:13 +0000 (22:26 +0200)]
lavc: add metadata to AVFrame

See thread:
Subject: [libav-devel] [PATCH 1/3] avcodec: add metadata to AVFrame
Date: Tue,  4 Oct 2011 00:19:51 +0200

6 years agoconfigure: Check that texi2html supports --init-file
jamal [Thu, 12 Jul 2012 07:07:59 +0000 (04:07 -0300)]
configure: Check that texi2html supports --init-file

Fixes ticket #1515

6 years agodoc/Makefile: Add missing $(HOSTEXESUF) to print_options
jamal [Thu, 12 Jul 2012 01:45:00 +0000 (22:45 -0300)]
doc/Makefile: Add missing $(HOSTEXESUF) to print_options

6 years agobuild: Fix documentation dependencies and rules
jamal [Thu, 12 Jul 2012 01:41:25 +0000 (22:41 -0300)]
build: Fix documentation dependencies and rules

6 years agodoc/filters: prefer "special" over "magic" for special input/output labels
Stefano Sabatini [Sat, 14 Jul 2012 09:10:24 +0000 (11:10 +0200)]
doc/filters: prefer "special" over "magic" for special input/output labels

6 years agodoc/filters: update documentation
Stefano Sabatini [Wed, 11 Jul 2012 15:47:24 +0000 (17:47 +0200)]
doc/filters: update documentation

In particular, assume existence of audio and sink filters.

6 years agodoc: merge libavfilter.texi into filters.texi
Stefano Sabatini [Wed, 11 Jul 2012 15:38:46 +0000 (17:38 +0200)]
doc: merge libavfilter.texi into filters.texi

There is no much point into splitting documentation for filters. Also
having a separate document for a library is inconsistent.

6 years agoffmpeg: use pkt_pts before pkt->pts for audio
Michael Niedermayer [Sat, 14 Jul 2012 02:24:40 +0000 (04:24 +0200)]
ffmpeg: use pkt_pts before pkt->pts for audio

This fixes the timestamp of the first packet when samples have been skiped.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: set pkt_timebase
Michael Niedermayer [Sat, 14 Jul 2012 02:24:00 +0000 (04:24 +0200)]
ffmpeg: set pkt_timebase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: adjust timestamp in case of skiping initial samples
Michael Niedermayer [Thu, 12 Jul 2012 20:18:36 +0000 (22:18 +0200)]
lavc: adjust timestamp in case of skiping initial samples

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: skip initial silence when requested
Michael Niedermayer [Wed, 4 Jul 2012 20:03:13 +0000 (22:03 +0200)]
lavc: skip initial silence when requested

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/w32pthreads: Fix make checkheaders.
jamal [Fri, 13 Jul 2012 23:05:06 +0000 (20:05 -0300)]
lavc/w32pthreads: Fix make checkheaders.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomovenc: write track header transformation matrix depending on "rotate" metadata
Stefan Gehrer [Fri, 13 Jul 2012 21:35:54 +0000 (23:35 +0200)]
movenc: write track header transformation matrix depending on "rotate" metadata

should fix ticket #505
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoexr: fix scan_line_size calculation
Paul B Mahol [Fri, 13 Jul 2012 23:48:50 +0000 (23:48 +0000)]
exr: fix scan_line_size calculation

This one will also work in cases when file have channels
we are not going to use.

Only compressed files where affected by this bug.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoexr: print channel names not yet supported
Paul B Mahol [Fri, 13 Jul 2012 22:50:59 +0000 (22:50 +0000)]
exr: print channel names not yet supported

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoexr: remove double ;;
Paul B Mahol [Fri, 13 Jul 2012 21:14:01 +0000 (21:14 +0000)]
exr: remove double ;;

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoexr: frame multithreading support
Paul B Mahol [Thu, 12 Jul 2012 20:39:55 +0000 (20:39 +0000)]
exr: frame multithreading support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 13 Jul 2012 20:21:38 +0000 (22:21 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: Fix APE tag dependencies
  MS Expression Encoder Screen decoder
  libfdk-aac: Allow setting the encoder bandwidth/cutoff frequency

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffv1enc: use default number of slices if unspecified
Michael Niedermayer [Fri, 13 Jul 2012 19:41:56 +0000 (21:41 +0200)]
ffv1enc: use default number of slices if unspecified

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffv1dec: print timestamp at which a CRC mismatch happened
Michael Niedermayer [Fri, 13 Jul 2012 19:03:26 +0000 (21:03 +0200)]
ffv1dec: print timestamp at which a CRC mismatch happened

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoadd PLV1 fourcc to mpeg4
Compn [Fri, 13 Jul 2012 19:10:53 +0000 (15:10 -0400)]
add PLV1 fourcc to mpeg4
works on http://samples.ffmpeg.org/V-codecs/PLV1/york-water-meteor.avi

6 years agolavc: add pkt_timebase to allow avcodec to adjust pkt_dts/pts when needed
Michael Niedermayer [Thu, 12 Jul 2012 20:17:10 +0000 (22:17 +0200)]
lavc: add pkt_timebase to allow avcodec to adjust pkt_dts/pts when needed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoimgconvert: deprecate avcodec_find_best_pix_fmt()
Janne Grunau [Mon, 2 Jul 2012 09:31:26 +0000 (11:31 +0200)]
imgconvert: deprecate avcodec_find_best_pix_fmt()

6 years agoimgconvert: add avcodec_find_best_pix_fmt2()
Janne Grunau [Mon, 2 Jul 2012 09:15:06 +0000 (11:15 +0200)]
imgconvert: add avcodec_find_best_pix_fmt2()

The number of pixel formats outgrew the number of available bits in
the bitmask used in avcodec_find_best_pix_fmt().
avcodec_find_best_pix_fmt2() uses a PIX_FMT_NONE terminated list
of pixel formats instead.

6 years agodoc/ffmpeg: document more deeply -re option.
burek [Wed, 11 Jul 2012 19:22:43 +0000 (21:22 +0200)]
doc/ffmpeg: document more deeply -re option.

Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>
6 years agodoc: Remove stray @item from git-howto
Derek Buitenhuis [Fri, 13 Jul 2012 15:35:11 +0000 (11:35 -0400)]
doc: Remove stray @item from git-howto

Fixes warning:
    ** @item outside of table or list (l. 362)

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibfdk-aac: Port to ff_alloc_packet2
Derek Buitenhuis [Fri, 13 Jul 2012 01:24:38 +0000 (21:24 -0400)]
libfdk-aac: Port to ff_alloc_packet2

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agodoxy: move av_guess_sample_aspect_ratio to correct place
Derek Buitenhuis [Wed, 30 May 2012 17:36:58 +0000 (13:36 -0400)]
doxy: move av_guess_sample_aspect_ratio to correct place

It should not be a part of the RIFF FourCCs group.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoimgconvert: avoid undefined left shift in avcodec_find_best_pix_fmt
Janne Grunau [Mon, 2 Jul 2012 08:46:39 +0000 (10:46 +0200)]
imgconvert: avoid undefined left shift in avcodec_find_best_pix_fmt

CC: libav-stable@libav.org
6 years agodoc/protocol.texi: fix missed application reference
Michael Niedermayer [Fri, 13 Jul 2012 15:17:21 +0000 (17:17 +0200)]
doc/protocol.texi: fix missed application reference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agogeneral.texi: fix project reference
Michael Niedermayer [Fri, 13 Jul 2012 15:16:13 +0000 (17:16 +0200)]
general.texi: fix project reference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskaenc: switch to av_assert
Michael Niedermayer [Fri, 13 Jul 2012 15:03:57 +0000 (17:03 +0200)]
matroskaenc: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: fix type of av_log() argument
Michael Niedermayer [Fri, 13 Jul 2012 14:24:32 +0000 (16:24 +0200)]
ffmpeg: fix type of av_log() argument

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuild: Fix APE tag dependencies
Diego Biurrun [Tue, 10 Jul 2012 16:38:46 +0000 (18:38 +0200)]
build: Fix APE tag dependencies

6 years agoMS Expression Encoder Screen decoder
Kostya Shishkov [Sat, 7 Jul 2012 11:21:52 +0000 (13:21 +0200)]
MS Expression Encoder Screen decoder

6 years agolavc: fix ff_alloc_packet()
Paul B Mahol [Fri, 13 Jul 2012 01:09:43 +0000 (01:09 +0000)]
lavc: fix ff_alloc_packet()

Regression introduced in 740b9ff44.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agobuild_system: mark libfdk as non GPL compatible until the situation is clarified...
Michael Niedermayer [Thu, 12 Jul 2012 22:51:01 +0000 (00:51 +0200)]
build_system: mark libfdk as non GPL compatible until the situation is clarified by someone qualified.

The license fee text may be interpreted as a additional restriction in the GPL sense.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 12 Jul 2012 21:53:48 +0000 (23:53 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: Fix Ogg demuxer dependencies
  build: Fix FLAC demuxer dependencies
  flac: Move flac functions shared between libraries to flac common code
  build: Fix CAF demuxer dependencies
  build: Fix MP2 muxer dependencies
  build: Add missing build rules for the ISMV muxer
  configure: Drop redundant mxf_d10 test dependency declaration
  Support AAC encoding via the external library fdk-aac
  libavcodec: Add more AAC profiles
  dct/fft-test: use a replacement getopt() if the system has none present.

Conflicts:
Changelog
libavcodec/Makefile
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolclenc: switch to av_assert
Michael Niedermayer [Thu, 12 Jul 2012 21:18:48 +0000 (23:18 +0200)]
lclenc: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomxfenc: switch to av_assert
Michael Niedermayer [Thu, 12 Jul 2012 21:16:24 +0000 (23:16 +0200)]
mxfenc: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibfdk-aac: Allow setting the encoder bandwidth/cutoff frequency
Martin Storsjö [Thu, 12 Jul 2012 18:19:08 +0000 (21:19 +0300)]
libfdk-aac: Allow setting the encoder bandwidth/cutoff frequency

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoav_samples_copy: support overlapping copies
Michael Niedermayer [Thu, 12 Jul 2012 19:36:22 +0000 (21:36 +0200)]
av_samples_copy: support overlapping copies

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomp3dec: parse initial silence padding information from lame tag
Michael Niedermayer [Wed, 4 Jul 2012 20:01:46 +0000 (22:01 +0200)]
mp3dec: parse initial silence padding information from lame tag

And pass the information on to the lavf core.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: inject sample skip side data when requested by the demuxer
Michael Niedermayer [Wed, 4 Jul 2012 20:00:50 +0000 (22:00 +0200)]
lavf: inject sample skip side data when requested by the demuxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoadd output for frame timestamps
Robert Krüger [Thu, 12 Jul 2012 08:24:59 +0000 (10:24 +0200)]
add output for frame timestamps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoexr: rle decompression
Paul B Mahol [Wed, 11 Jul 2012 23:33:34 +0000 (23:33 +0000)]
exr: rle decompression

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 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

6 years agobuild: Fix Ogg demuxer dependencies
Diego Biurrun [Tue, 10 Jul 2012 16:42:56 +0000 (18:42 +0200)]
build: Fix Ogg demuxer dependencies

6 years agobuild: Fix FLAC demuxer dependencies
Diego Biurrun [Tue, 10 Jul 2012 16:42:34 +0000 (18:42 +0200)]
build: Fix FLAC demuxer dependencies

6 years agoflac: Move flac functions shared between libraries to flac common code
Diego Biurrun [Tue, 10 Jul 2012 16:32:41 +0000 (18:32 +0200)]
flac: Move flac functions shared between libraries to flac common code

This fixes a number of flac-related build dependencies.

6 years agobuild: Fix CAF demuxer dependencies
Diego Biurrun [Tue, 10 Jul 2012 16:42:13 +0000 (18:42 +0200)]
build: Fix CAF demuxer dependencies

6 years agobuild: Fix MP2 muxer dependencies
Diego Biurrun [Tue, 10 Jul 2012 16:39:23 +0000 (18:39 +0200)]
build: Fix MP2 muxer dependencies

6 years agobuild: Add missing build rules for the ISMV muxer
Diego Biurrun [Tue, 10 Jul 2012 16:21:45 +0000 (18:21 +0200)]
build: Add missing build rules for the ISMV muxer

6 years agoconfigure: Drop redundant mxf_d10 test dependency declaration
Diego Biurrun [Tue, 10 Jul 2012 20:17:26 +0000 (22:17 +0200)]
configure: Drop redundant mxf_d10 test dependency declaration

The mxf_d10 test depends on avconv, which depends on avfilter, so there
is no need to declare an avfilter dependency for the mxf_d10 test.

6 years agoSupport AAC encoding via the external library fdk-aac
Martin Storsjö [Thu, 28 Jun 2012 13:46:24 +0000 (16:46 +0300)]
Support AAC encoding via the external library fdk-aac

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolibavcodec: Add more AAC profiles
Martin Storsjö [Fri, 29 Jun 2012 07:52:18 +0000 (10:52 +0300)]
libavcodec: Add more AAC profiles

The numerical values of the profiles are the MPEG4 Audio Object
Type values, minus one.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 years agodct/fft-test: use a replacement getopt() if the system has none present.
Ronald S. Bultje [Wed, 4 Jul 2012 03:14:09 +0000 (20:14 -0700)]
dct/fft-test: use a replacement getopt() if the system has none present.

This allows compiling and running these tests on systems lacking a built-
in version of getopt(), such as MSVC.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 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>
6 years agoTechSmith Screen Codec 2 decoder
Kostya Shishkov [Sun, 8 Jul 2012 17:51:08 +0000 (19:51 +0200)]
TechSmith Screen Codec 2 decoder

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

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

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

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