OSDN Git Service

android-x86/external-ffmpeg.git
12 years agodoc/filters: Fix two typos
Tim Nicholson [Mon, 16 Jul 2012 07:36:06 +0000 (08:36 +0100)]
doc/filters: Fix two typos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoexr: check size of uncompressed buffer returned by uncompress()
Paul B Mahol [Fri, 13 Jul 2012 02:02:10 +0000 (02:02 +0000)]
exr: check size of uncompressed buffer returned by uncompress()

The actual size of uncompressed buffer returned by uncompress() may be
smaller than expected, so abort decoding in such cases.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years agoChangelog: add geotiff
Michael Niedermayer [Mon, 16 Jul 2012 00:07:25 +0000 (02:07 +0200)]
Changelog: add geotiff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 15 Jul 2012 23:32:52 +0000 (01:32 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Check for CommandLineToArgvW
  vc1dec: Do not use random pred_flag if motion vector data is skipped
  vp8: Enclose pthread function calls in ifdefs
  snow: refactor code to work around a compiler bug in MSVC.
  vp8: Include the thread headers before using the pthread types
  configure: Check for getaddrinfo in ws2tcpip.h, too
  vp8: implement sliced threading
  vp8: move data from VP8Context->VP8Macroblock
  vp8: refactor decoding a single mb_row
  doc: update api changes with the right commit hashes
  mem: introduce av_malloc_array and av_mallocz_array

Conflicts:
configure
doc/APIchanges
libavcodec/vp8.c
libavutil/mem.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffprobe: reindent after the previous commit
Stefano Sabatini [Sun, 15 Jul 2012 14:27:22 +0000 (16:27 +0200)]
ffprobe: reindent after the previous commit

12 years agoffprobe: only decode frame if the codec is available
Stefano Sabatini [Sun, 15 Jul 2012 13:56:02 +0000 (15:56 +0200)]
ffprobe: only decode frame if the codec is available

Fix crash when a stream codec is unknown, in particular fix trac
ticket #1243.

12 years agolavfi: decrease logging level of message showing initial parameters
Stefano Sabatini [Sat, 14 Jul 2012 16:26:04 +0000 (18:26 +0200)]
lavfi: decrease logging level of message showing initial parameters

Reduce log clutter, consistent with 1a49a169eb74a97.

12 years agoSimplify ptx decoding on big-endian.
Carl Eugen Hoyos [Sun, 15 Jul 2012 13:04:44 +0000 (15:04 +0200)]
Simplify ptx decoding on big-endian.

Reviewed-by: Reimar Döffinger
12 years agoriff: Assign U263 FourCC to CODEC_ID_H263
Piotr Bandurski [Sun, 15 Jul 2012 12:55:05 +0000 (14:55 +0200)]
riff: Assign U263 FourCC to CODEC_ID_H263

12 years agoisom: add "NO16" FourCC
Piotr Bandurski [Sun, 15 Jul 2012 11:25:47 +0000 (13:25 +0200)]
isom: add "NO16" FourCC

samples:

http://www.datafilehost.com/download-46d9a0fa.html

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoriff: add dvis/pdvc FourCCs
Piotr Bandurski [Sun, 15 Jul 2012 10:49:27 +0000 (12:49 +0200)]
riff: add dvis/pdvc FourCCs

samples:

http://www.datafilehost.com/download-4b49270d.html

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolavc: add seperate AVCodec for CODEC_ID_H263P so demuxers can use that id.
Michael Niedermayer [Sun, 15 Jul 2012 11:54:08 +0000 (13:54 +0200)]
lavc: add seperate AVCodec for CODEC_ID_H263P so demuxers can use that id.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 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>
12 years agoconfigure: Check for CommandLineToArgvW
Ronald S. Bultje [Mon, 25 Jun 2012 05:43:14 +0000 (08:43 +0300)]
configure: Check for CommandLineToArgvW

The actual result of the check isn't used anywhere (since we
use this function unconditionally within #ifdef _WIN32), but it
makes sure we explicitly link to shell32 (which is linked in
implictly on mingw).

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agovc1dec: Do not use random pred_flag if motion vector data is skipped
Mashiat Sarker Shakkhar [Sun, 15 Jul 2012 01:37:10 +0000 (07:37 +0600)]
vc1dec: Do not use random pred_flag if motion vector data is skipped

This fixes SA10143.vc1 from test-suite. Also partially fixes MC-VC1.ts
from videolan streams archive.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agovp8: Enclose pthread function calls in ifdefs
Martin Storsjö [Sat, 14 Jul 2012 21:11:35 +0000 (00:11 +0300)]
vp8: Enclose pthread function calls in ifdefs

This fixes building with threads disabled.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 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>
12 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>
12 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>
12 years agosnow: refactor code to work around a compiler bug in MSVC.
Ronald S. Bultje [Sat, 7 Jul 2012 16:06:50 +0000 (09:06 -0700)]
snow: refactor code to work around a compiler bug in MSVC.

This fixes the compiler error "cannot convert from 'BlockNode' to
'int16_t'".

12 years agovp8: Include the thread headers before using the pthread types
Martin Storsjö [Sat, 14 Jul 2012 21:19:44 +0000 (00:19 +0300)]
vp8: Include the thread headers before using the pthread types

This was unnoticed on linux, since stdlib.h apparently includes
files declaring the pthread_mutex_t and pthread_cond_t types.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
12 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>
12 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>
12 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>
12 years agoconfigure: Check for getaddrinfo in ws2tcpip.h, too
Ronald S. Bultje [Sun, 24 Jun 2012 19:22:29 +0000 (22:22 +0300)]
configure: Check for getaddrinfo in ws2tcpip.h, too

This function is only available in the headers if unconditionally
targeting a version >= XP. It is not strictly necessary, since we
try loading these functions dynamically at runtime on windows in
the fallback, but this makes things a bit faster and more
straightforward.

On mingw32, this function isn't visible by default, while it is
on mingw64 (on both 32 and 64 bit).

Signed-off-by: Martin Storsjö <martin@martin.st>
12 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>
12 years agovp8: implement sliced threading
Daniel Kang [Thu, 12 Jul 2012 20:07:06 +0000 (13:07 -0700)]
vp8: implement sliced threading

Testing gives 25-30% gain on HD clips with two threads and
up to 50% gain with eight threads.

Sliced threading uses more memory than single or frame threading.

Frame threading and single threading keep the previous memory
layout.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years agovp8: move data from VP8Context->VP8Macroblock
Daniel Kang [Wed, 11 Jul 2012 18:34:05 +0000 (11:34 -0700)]
vp8: move data from VP8Context->VP8Macroblock

In preparation for sliced threading.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years agovp8: refactor decoding a single mb_row
Daniel Kang [Wed, 11 Jul 2012 18:34:04 +0000 (11:34 -0700)]
vp8: refactor decoding a single mb_row

This is in preperation for sliced threading.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years agodoc: update api changes with the right commit hashes
Luca Barbato [Tue, 10 Jul 2012 23:45:26 +0000 (01:45 +0200)]
doc: update api changes with the right commit hashes

12 years agomem: introduce av_malloc_array and av_mallocz_array
Luca Barbato [Mon, 9 Jul 2012 13:29:30 +0000 (15:29 +0200)]
mem: introduce av_malloc_array and av_mallocz_array

Both function ease allocating large arrays implementing the overflow
check inside it.

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

12 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

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

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

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

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

12 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

12 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

12 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

12 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

12 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

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

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

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

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

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

12 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>
12 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>
12 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>
12 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>
12 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
12 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>
12 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>
12 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>
12 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>
12 years agobuild: Fix APE tag dependencies
Diego Biurrun [Tue, 10 Jul 2012 16:38:46 +0000 (18:38 +0200)]
build: Fix APE tag dependencies

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

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

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

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

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

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

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

12 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

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

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