OSDN Git Service

android-x86/external-ffmpeg.git
12 years agoffmpeg: copy subtitles frame dimensions.
Nicolas George [Thu, 9 Aug 2012 09:55:22 +0000 (11:55 +0200)]
ffmpeg: copy subtitles frame dimensions.

The sub-movtextenc ref file changes because the dimensions
(400×60) are stored by the format.

12 years agoffmpeg: make -s work for subtitles too.
Nicolas George [Thu, 9 Aug 2012 09:51:45 +0000 (11:51 +0200)]
ffmpeg: make -s work for subtitles too.

Some codecs allow to encode the frame size and some players use it.

12 years agodvdsubenc: set frame size in extradata.
Nicolas George [Tue, 7 Aug 2012 17:05:43 +0000 (19:05 +0200)]
dvdsubenc: set frame size in extradata.

12 years agolavf: probe PGS subtitles definition.
Nicolas George [Tue, 7 Aug 2012 16:53:00 +0000 (18:53 +0200)]
lavf: probe PGS subtitles definition.

The resolution is in the packets, so decoding must happen.
Since most other formats do not set the dimension, make it
a special case for PGS. If other codecs were to have the
same requirement, using a CODEC_CAP would be preferred.

12 years agodvdsubenc: make it usable for transcoding.
Nicolas George [Mon, 6 Aug 2012 12:14:27 +0000 (14:14 +0200)]
dvdsubenc: make it usable for transcoding.

DVD subtitles packets can only encode a single rectangle:
if there are several, copy them into a big transparent one.

DVD subtitles rely on an external 16-colors palette:
use a reasonable default one, stored in the private context,
and encode it into the extradata, as specified by Matroska.
TODO: allow to change the palette with an option.

Each packet can use four colors out of the global palette.
The old logic was to map transparent colors to the color 0
and all other colors to 3, 2, 1, cyclically in descending
frequency order, completely disregarding the original color.

Select the "best" four colors from the global palette, according
to heuristics based on frequency, opacity and brightness, and
arrange them in standard DVD order: background, foreground,
outline, other.
TODO: select the alpha value more finely; see if CHG_COLCON can
allow more than 4 colors per packet.

Reference:
http://dvd.sourceforge.net/dvdinfo/spu.html

With these changes, dvdsubenc can be used to transcode DVB subtitles
and get a very decent result.

12 years agoffmpeg: add an option to fix subtitles durations.
Nicolas George [Thu, 9 Aug 2012 09:44:17 +0000 (11:44 +0200)]
ffmpeg: add an option to fix subtitles durations.

With this option, transcoding DVB subtitles becomes possible.

12 years agovda: merge implementation into one file.
Sebastien Zwickert [Sun, 12 Aug 2012 15:03:06 +0000 (17:03 +0200)]
vda: merge implementation into one file.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agovda: support synchronous decoding.
Sebastien Zwickert [Sun, 12 Aug 2012 15:03:05 +0000 (17:03 +0200)]
vda: support synchronous decoding.

Note that the symbols used to run the hardware decoder in asynchronous mode
has been marked as deprecated and will be dropped at a future version dump.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomore verbose error messages at configure time
rogerdpack [Thu, 9 Aug 2012 20:12:02 +0000 (14:12 -0600)]
more verbose error messages at configure time

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoasfdec: ignore too tiny indexes
Michael Niedermayer [Tue, 14 Aug 2012 01:21:08 +0000 (03:21 +0200)]
asfdec: ignore too tiny indexes

Fixes Ticket1521

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agohls: Initialize stream_offset before find_stream_info.
Michael Niedermayer [Mon, 13 Aug 2012 18:37:52 +0000 (20:37 +0200)]
hls: Initialize stream_offset before find_stream_info.

find stream info causes reads that may use the offset in their callback

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agohls: check that the streams have been initialized before checking their discard flags.
Michael Niedermayer [Mon, 13 Aug 2012 18:37:04 +0000 (20:37 +0200)]
hls: check that the streams have been initialized before checking their discard flags.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoProresenc: add multithreading support
Speedy Gonzales [Mon, 13 Aug 2012 15:16:47 +0000 (17:16 +0200)]
Proresenc: add multithreading support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agog723_1dec: inline normalize_bits() in scale vector and optimize it.
Michael Niedermayer [Mon, 13 Aug 2012 13:18:47 +0000 (15:18 +0200)]
g723_1dec: inline normalize_bits() in scale vector and optimize it.

many branches and cases of scale_vector are irrelevant for the case here
and by inlining they can be reliably removed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agog723_1dec: remove dead code that leaked in from libav
Michael Niedermayer [Mon, 13 Aug 2012 13:02:21 +0000 (15:02 +0200)]
g723_1dec: remove dead code that leaked in from libav

It appears someone thinks this special case can be reached
Well, it cannot, thus not only do we not need to optimize it
we dont need it at all

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agog723_1dec: remove unneeded cliping that leaked in from merge from libav
Michael Niedermayer [Mon, 13 Aug 2012 13:01:45 +0000 (15:01 +0200)]
g723_1dec: remove unneeded cliping that leaked in from merge from libav

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agog723_1dec: avoid memcpy
Michael Niedermayer [Mon, 13 Aug 2012 12:53:29 +0000 (14:53 +0200)]
g723_1dec: avoid memcpy

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 13 Aug 2012 12:38:43 +0000 (14:38 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (22 commits)
  g723.1: do not pass large structs by value
  g723.1: do not bounce intermediate values via memory
  g723.1: declare a variable in the block it is used
  g723.1: avoid saving/restoring excitation
  g723.1: avoid unnecessary memcpy() in residual_interp()
  g723.1: make postfilter write directly to output buffer
  g723.1: drop unnecessary variable buf_ptr in formant_postfilter()
  g723.1: make scale_vector() output to a separate buffer
  g723.1: make autocorr_max() work on an arbitrary buffer
  g723.1: do not needlessly use int64_t
  g723.1: use saturating addition functions
  g723.1: optimise scale_vector()
  g723.1: remove useless uses of MUL64()
  g723.1: remove unnecessary argument 'shift' from dot_product()
  g723.1: deobfuscate "(x << 4) - x" to "15 * x"
  celp: optimise ff_celp_lp_synthesis_filter()
  libavutil: add saturating addition functions
  cllc: Implement ARGB support
  cllc: Add support for QRGB
  cllc: Rename some funcs to represent what they actually do
  ...

Conflicts:
LICENSE
libavcodec/g723_1.c
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agopaf: prevent invalid write
Paul B Mahol [Mon, 13 Aug 2012 12:26:38 +0000 (12:26 +0000)]
paf: prevent invalid write

Closes #1631.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years agobuild: extend documentation building mechanism
Stefano Sabatini [Thu, 9 Aug 2012 21:37:28 +0000 (23:37 +0200)]
build: extend documentation building mechanism

Allow to select specific documentation components, and reliably check for
component dependencies.

In particular, check for perl presence on the system.

12 years agolavfi: add hue filter
Jérémy Tran [Sun, 12 Aug 2012 11:26:17 +0000 (13:26 +0200)]
lavfi: add hue filter

This is a port of the MPlayer hue filter (libmpcodecs/vf_hue.c) by
Michael Niedermayer.

Signed-off-by: Jérémy Tran <tran.jeremy.av@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
12 years agolavc: add missing codec descriptors.
Nicolas George [Sun, 12 Aug 2012 22:59:03 +0000 (00:59 +0200)]
lavc: add missing codec descriptors.

12 years agotools: add a script to find missing codec descriptors.
Nicolas George [Sun, 12 Aug 2012 22:31:13 +0000 (00:31 +0200)]
tools: add a script to find missing codec descriptors.

12 years agoh264_cavlc: switch forgotten assert to av_assert
Michael Niedermayer [Mon, 13 Aug 2012 03:59:44 +0000 (05:59 +0200)]
h264_cavlc: switch forgotten assert to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoh264: fix x264 build detection
Michael Niedermayer [Mon, 13 Aug 2012 02:58:15 +0000 (04:58 +0200)]
h264: fix x264 build detection

Fixes Ticket1503

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agog723.1: do not pass large structs by value
Mans Rullgard [Sat, 11 Aug 2012 20:04:14 +0000 (21:04 +0100)]
g723.1: do not pass large structs by value

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agog723.1: do not bounce intermediate values via memory
Mans Rullgard [Sat, 11 Aug 2012 20:00:21 +0000 (21:00 +0100)]
g723.1: do not bounce intermediate values via memory

Although a reasonable compiler will probably optimise out the
actual store and load, this operation still implies a truncation
to 16 bits which the compiler will probably not realise is not
necessary here.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agog723.1: declare a variable in the block it is used
Mans Rullgard [Sat, 11 Aug 2012 19:19:39 +0000 (20:19 +0100)]
g723.1: declare a variable in the block it is used

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agog723.1: avoid saving/restoring excitation
Mans Rullgard [Sat, 11 Aug 2012 18:59:08 +0000 (19:59 +0100)]
g723.1: avoid saving/restoring excitation

Writing the scaled excitation to a scratch buffer (borrowing the
'audio' array) instead of modifying it in place avoids the need
to save and restore the unscaled values.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agog723.1: avoid unnecessary memcpy() in residual_interp()
Mans Rullgard [Sat, 11 Aug 2012 04:23:59 +0000 (05:23 +0100)]
g723.1: avoid unnecessary memcpy() in residual_interp()

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agog723.1: make postfilter write directly to output buffer
Mans Rullgard [Sat, 11 Aug 2012 21:26:38 +0000 (22:26 +0100)]
g723.1: make postfilter write directly to output buffer

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agog723.1: drop unnecessary variable buf_ptr in formant_postfilter()
Mans Rullgard [Sat, 11 Aug 2012 02:39:30 +0000 (03:39 +0100)]
g723.1: drop unnecessary variable buf_ptr in formant_postfilter()

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agog723.1: make scale_vector() output to a separate buffer
Mans Rullgard [Sat, 11 Aug 2012 11:21:41 +0000 (12:21 +0100)]
g723.1: make scale_vector() output to a separate buffer

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agog723.1: make autocorr_max() work on an arbitrary buffer
Mans Rullgard [Sat, 11 Aug 2012 11:16:53 +0000 (12:16 +0100)]
g723.1: make autocorr_max() work on an arbitrary buffer

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agog723.1: do not needlessly use int64_t
Mans Rullgard [Sat, 11 Aug 2012 01:43:14 +0000 (02:43 +0100)]
g723.1: do not needlessly use int64_t

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agog723.1: use saturating addition functions
Mans Rullgard [Sat, 11 Aug 2012 00:52:10 +0000 (01:52 +0100)]
g723.1: use saturating addition functions

Use saturating addition functions instead of 64-bit intermediates
and separate clipping.  This is much faster when dedicated
instructions are available.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agog723.1: optimise scale_vector()
Mans Rullgard [Fri, 10 Aug 2012 17:15:41 +0000 (18:15 +0100)]
g723.1: optimise scale_vector()

Firstly, nothing in this function can overflow 32 bits so the use
of a 64-bit type is completely unnecessary.  Secondly, the scale
is either a power of two or 0x7fff.  Doing separate loops for these
cases avoids using multiplications.  Finally, since only the number
of bits, not the actual value, of the maximum value is needed, the
bitwise or of all the values serves the purpose while being faster.

It is worth noting that even if overflow could happen, it was not
handled correctly anyway.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agog723.1: remove useless uses of MUL64()
Mans Rullgard [Fri, 10 Aug 2012 15:42:54 +0000 (16:42 +0100)]
g723.1: remove useless uses of MUL64()

The operands in both cases are 16-bit so cannot overflow a 32-bit
destination.  In gain_scale() the inputs are reduced to 14-bit,
so even the shift cannot overflow.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agog723.1: remove unnecessary argument 'shift' from dot_product()
Mans Rullgard [Fri, 10 Aug 2012 14:41:47 +0000 (15:41 +0100)]
g723.1: remove unnecessary argument 'shift' from dot_product()

The 'shift' argument is always 1 so there is no need to pass it
explicitly in every call.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agog723.1: deobfuscate "(x << 4) - x" to "15 * x"
Mans Rullgard [Sat, 11 Aug 2012 00:54:15 +0000 (01:54 +0100)]
g723.1: deobfuscate "(x << 4) - x" to "15 * x"

The compiler performs this optimisation.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agocelp: optimise ff_celp_lp_synthesis_filter()
Mans Rullgard [Sat, 11 Aug 2012 03:18:53 +0000 (04:18 +0100)]
celp: optimise ff_celp_lp_synthesis_filter()

Adding instead of subtracting the products in the loop allows the
compiler to generate more efficient multiply-accumulate instructions
when 16-bit multiply-subtract is not available. ARM has only
multiply-accumulate for 16-bit operands.  In general, if only one
variant exists, it is usually accumulate rather than subtract.

In the same spirit, using the dedicated saturation function enables
use of any special optimised versions of this.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agolibavutil: add saturating addition functions
Mans Rullgard [Sat, 11 Aug 2012 00:15:19 +0000 (01:15 +0100)]
libavutil: add saturating addition functions

Fixed-point audio codecs often use saturating arithmetic, and
special instructions for these operations are common.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agoriffenc: fix aac
Michael Niedermayer [Sun, 12 Aug 2012 23:41:55 +0000 (01:41 +0200)]
riffenc: fix aac

Fixes Ticket1435

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolavfi: add avfilter_get_class() and iteration callbacks
Stefano Sabatini [Thu, 9 Aug 2012 12:59:10 +0000 (14:59 +0200)]
lavfi: add avfilter_get_class() and iteration callbacks

Allow iteration over filter options.

12 years agolavu/opt.h: add AV_OPT_FLAG_FILTERING_PARAM macro
Stefano Sabatini [Thu, 9 Aug 2012 14:21:07 +0000 (16:21 +0200)]
lavu/opt.h: add AV_OPT_FLAG_FILTERING_PARAM macro

12 years agodoc/texi2pod: add "use warnings" directive
Stefano Sabatini [Sun, 12 Aug 2012 08:35:03 +0000 (10:35 +0200)]
doc/texi2pod: add "use warnings" directive

The script was previously run with perl -w through the shebang
command. Now that the script is executed through direct perl invocation
the -w in the shebang command is ignored. This patch re-enables "use
warnings" whatever way the script is invoked.

Idea-By: jamal <jamrial@gmail.com>
12 years agoOptimized unscaled yuvp9/yuvp10 -> yuvp16 conversion.
Reimar Döffinger [Sat, 11 Aug 2012 12:15:09 +0000 (14:15 +0200)]
Optimized unscaled yuvp9/yuvp10 -> yuvp16 conversion.

About 30% faster on 32 bit Atom, 120% faster on 64 bit Phenom2.
This is interesting because supporting P16 is easier in e.g.
OpenGL (can misuse support for any 2-component 8 bit format),
whereas supporting p9/p10 without conversion needs a texture
format with at least 14 bits actual precision.
The shiftonly == 0 case is not optimized since the code is more
complex and the speed gain less obvious.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
12 years agooggparsetheora: fix metadata parsing
Michael Niedermayer [Sun, 12 Aug 2012 21:09:45 +0000 (23:09 +0200)]
oggparsetheora: fix metadata parsing

Fixes Ticket1508
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agocllc: Implement ARGB support
Derek Buitenhuis [Fri, 10 Aug 2012 16:05:49 +0000 (16:05 +0000)]
cllc: Implement ARGB support

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
12 years agocllc: Implement ARGB support
Derek Buitenhuis [Fri, 10 Aug 2012 16:05:49 +0000 (16:05 +0000)]
cllc: Implement ARGB support

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
12 years agocllc: Add support for QRGB
Derek Buitenhuis [Fri, 10 Aug 2012 17:19:03 +0000 (17:19 +0000)]
cllc: Add support for QRGB

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
12 years agocllc: Rename some funcs to represent what they actually do
Derek Buitenhuis [Fri, 10 Aug 2012 16:05:47 +0000 (16:05 +0000)]
cllc: Rename some funcs to represent what they actually do

This is in preparation for adding support for other colorspaces
and coding types.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
12 years agocllc: Add support for QRGB
Derek Buitenhuis [Fri, 10 Aug 2012 17:19:03 +0000 (17:19 +0000)]
cllc: Add support for QRGB

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
12 years agocllc: Rename some funcs to represent what they actually do
Derek Buitenhuis [Fri, 10 Aug 2012 16:05:47 +0000 (16:05 +0000)]
cllc: Rename some funcs to represent what they actually do

This is in preparation for adding support for other colorspaces
and coding types.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
12 years agoffplay: avoid SDL_atoi()
Michael Niedermayer [Fri, 10 Aug 2012 14:03:42 +0000 (16:03 +0200)]
ffplay: avoid SDL_atoi()

It appears this function is not available everywhere
Should fix Ticket1525

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoFix reading past the end of frame buffer.
Boris Maksalov [Fri, 10 Aug 2012 08:50:35 +0000 (09:50 +0100)]
Fix reading past the end of frame buffer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomov: remux AALP tag
Piotr Bandurski [Fri, 10 Aug 2012 13:48:20 +0000 (15:48 +0200)]
mov: remux AALP tag

AALP(AALP001) tag is present in 32bpp files encoded with avid codecs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agofate: split asyncts from aresample test
Michael Niedermayer [Sun, 12 Aug 2012 13:45:23 +0000 (15:45 +0200)]
fate: split asyncts from aresample test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agox86: Drop silly "_yasm" suffixes from filenames
Diego Biurrun [Tue, 7 Aug 2012 22:35:43 +0000 (00:35 +0200)]
x86: Drop silly "_yasm" suffixes from filenames

12 years agolavf: reimplement is_intra_only() by using the AVCodecContext codec descriptor
Michael Niedermayer [Sat, 11 Aug 2012 14:09:44 +0000 (16:09 +0200)]
lavf: reimplement is_intra_only() by using the AVCodecContext codec descriptor

This also changes behavior as the descriptor table is more complete than
the switch/case it replaces. As well as considering all non video as
intra only

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolavc: add codec_descriptor field to AVCodecContext.
Michael Niedermayer [Sat, 11 Aug 2012 14:07:28 +0000 (16:07 +0200)]
lavc: add codec_descriptor field to AVCodecContext.

This can be used to avoid a time consuming lookup of the
descriptor

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 12 Aug 2012 11:43:03 +0000 (13:43 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf: Detect discontinuities in timestamps for framerate/analyzeduration calculation
  lavf: Initialize the stream info timestamps in avformat_new_stream
  id3v2: Match PIC mimetype/format case-insensitively
  configure: Rename check_asm() to more fitting check_inline_asm()
  fate: Only test enabled filters
  avresample: De-doxygenize some comments where Doxygen is not appropriate
  rtmp: split chunk_size var into in_chunk_size and out_chunk_size
  rtmp: Factorize the code by adding find_tracked_method

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodoc: Clarify licensing issues arising from external libraries
Diego Biurrun [Sat, 21 Jul 2012 21:17:30 +0000 (21:17 +0000)]
doc: Clarify licensing issues arising from external libraries

12 years agolavf: Detect discontinuities in timestamps for framerate/analyzeduration calculation
Martin Storsjö [Sat, 11 Aug 2012 18:24:40 +0000 (21:24 +0300)]
lavf: Detect discontinuities in timestamps for framerate/analyzeduration calculation

If the dts difference is more than 1000 times the average dts
difference, restart the analysis.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agolavf: Initialize the stream info timestamps in avformat_new_stream
Martin Storsjö [Sat, 11 Aug 2012 17:06:08 +0000 (20:06 +0300)]
lavf: Initialize the stream info timestamps in avformat_new_stream

These are normally initialized to AV_NOPTS_VALUE at the start
of avformat_find_stream_info, but if a new stream is found while
this function is running (e.g. like in mpegts), the newly added
AVStreams didn't have these values properly initalized, leading
to avformat_find_stream_info terminating too soon (when the
first timestamps are far from 0).

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agoid3v2: Match PIC mimetype/format case-insensitively
Mohammad Alsaleh [Fri, 10 Aug 2012 22:50:25 +0000 (01:50 +0300)]
id3v2: Match PIC mimetype/format case-insensitively

Some files' embedded art seems to have the mimetype 'image/JPG' instead
of 'image/jpg'. Libav fails to parse those because it matches
case-sensitively.

Use av_strncasecmp() to fix this behaviour.

Signed-off-by: Mohammad Alsaleh <msal@tormail.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agosgidec: fix error free end detection.
Michael Niedermayer [Sun, 12 Aug 2012 03:32:07 +0000 (05:32 +0200)]
sgidec: fix error free end detection.

Fixes Ticket1506
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agosgidec: correct end pointer
Michael Niedermayer [Sun, 12 Aug 2012 03:31:14 +0000 (05:31 +0200)]
sgidec: correct end pointer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffmpeg: Do not discard slightly invalid timestamps.
Michael Niedermayer [Sat, 11 Aug 2012 21:38:48 +0000 (23:38 +0200)]
ffmpeg: Do not discard slightly invalid timestamps.

Fixes Ticket1627

The fate change is due to ffmpeg no longer pushing audio timestamps
aggressively up (which is what caused the AV sync issues in the ticket)
but leaving them as they are.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agovc1dec: support debug & FF_DEBUG_PICT_INFO.
Michael Niedermayer [Sat, 11 Aug 2012 22:27:57 +0000 (00:27 +0200)]
vc1dec: support debug & FF_DEBUG_PICT_INFO.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolavf: do not discard correct dts in favor of wrong pts for vc1-wmapro.ism
Michael Niedermayer [Sat, 11 Aug 2012 22:48:49 +0000 (00:48 +0200)]
lavf: do not discard correct dts in favor of wrong pts for vc1-wmapro.ism

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomov: add av_dlog() to CTTS reading code like is already done in STTS.
Michael Niedermayer [Sat, 11 Aug 2012 21:27:27 +0000 (23:27 +0200)]
mov: add av_dlog() to CTTS reading code like is already done in STTS.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoconfigure: Rename check_asm() to more fitting check_inline_asm()
Diego Biurrun [Tue, 7 Aug 2012 21:46:52 +0000 (23:46 +0200)]
configure: Rename check_asm() to more fitting check_inline_asm()

12 years agofate: Only test enabled filters
Diego Biurrun [Wed, 1 Aug 2012 22:35:42 +0000 (00:35 +0200)]
fate: Only test enabled filters

This fixes running FATE without --enable-gpl.

12 years agoavresample: De-doxygenize some comments where Doxygen is not appropriate
Diego Biurrun [Thu, 9 Aug 2012 01:06:23 +0000 (03:06 +0200)]
avresample: De-doxygenize some comments where Doxygen is not appropriate

12 years agoasfdec: fix FRAME_HEADER_SIZE
Michael Niedermayer [Sat, 11 Aug 2012 17:44:33 +0000 (19:44 +0200)]
asfdec: fix FRAME_HEADER_SIZE

Fixes Ticket1477

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodsputil_template: switch to av_assert
Michael Niedermayer [Sat, 11 Aug 2012 14:58:18 +0000 (16:58 +0200)]
dsputil_template: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 11 Aug 2012 12:50:54 +0000 (14:50 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf: simplify is_intra_only() by using codec descriptors.
  lavc: add an intra-only codec property.
  lavc: add codec descriptors.
  lavc: fix mixing CODEC_ID/AV_CODEC_ID in C++ code.
  dict: move struct AVDictionary definition to dict.c
  dict: add av_dict_count()

Conflicts:
doc/APIchanges
libavcodec/old_codec_ids.h
libavformat/utils.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agortmp: split chunk_size var into in_chunk_size and out_chunk_size
Jordi Ortiz [Fri, 10 Aug 2012 17:03:22 +0000 (19:03 +0200)]
rtmp: split chunk_size var into in_chunk_size and out_chunk_size

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agortmp: Factorize the code by adding find_tracked_method
Samuel Pitoiset [Sat, 11 Aug 2012 10:41:32 +0000 (12:41 +0200)]
rtmp: Factorize the code by adding find_tracked_method

Also fix the bytestream reader size parameter to take the
offset into account.

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agolavf: simplify is_intra_only() by using codec descriptors.
Anton Khirnov [Thu, 9 Aug 2012 16:39:56 +0000 (18:39 +0200)]
lavf: simplify is_intra_only() by using codec descriptors.

12 years agolavc: add an intra-only codec property.
Anton Khirnov [Thu, 9 Aug 2012 16:34:10 +0000 (18:34 +0200)]
lavc: add an intra-only codec property.

12 years agolavc: add codec descriptors.
Anton Khirnov [Sun, 5 Aug 2012 13:18:00 +0000 (15:18 +0200)]
lavc: add codec descriptors.

They describe properties that are inherent to a codec (as described by
an AVCodecID) without referring to a specific implementation.

12 years agosnowdec: increase stack size
Michael Niedermayer [Sat, 11 Aug 2012 03:32:16 +0000 (05:32 +0200)]
snowdec: increase stack size

Fixes Ticket1632

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodwt: switch to av_assert
Michael Niedermayer [Sat, 11 Aug 2012 01:32:51 +0000 (03:32 +0200)]
dwt: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomsrle: fix regression causing null ptr dereference
Michael Niedermayer [Sat, 11 Aug 2012 00:20:06 +0000 (02:20 +0200)]
msrle: fix regression causing null ptr dereference

Fixes Ticket1630

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agocavsdec: check dimensions being valid.
Michael Niedermayer [Sat, 11 Aug 2012 00:00:33 +0000 (02:00 +0200)]
cavsdec: check dimensions being valid.

Fixes crash
Fixes Ticket1628

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomp3enc: fix CODEC_ID/CodecID that leaked in from older patch
Michael Niedermayer [Fri, 10 Aug 2012 23:25:19 +0000 (01:25 +0200)]
mp3enc: fix CODEC_ID/CodecID that leaked in from older patch

Found-by: jamal <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodoc/Makefile: invoke perl to interpret texi2pod.pl
Stefano Sabatini [Fri, 10 Aug 2012 09:49:27 +0000 (11:49 +0200)]
doc/Makefile: invoke perl to interpret texi2pod.pl

Do not rely on shebang directive in the script, whose exact behavior is
system dependent.

12 years agocmdutils: show options in show_help_children only if the context has options
Stefano Sabatini [Thu, 9 Aug 2012 12:44:18 +0000 (14:44 +0200)]
cmdutils: show options in show_help_children only if the context has options

Avoid to print a pointless name of the context followed by an empty list.

12 years agolavu/opt: fix crash in av_opt_next() in case the class has no options
Stefano Sabatini [Thu, 9 Aug 2012 09:50:58 +0000 (11:50 +0200)]
lavu/opt: fix crash in av_opt_next() in case the class has no options

12 years agolavc: fix mixing CODEC_ID/AV_CODEC_ID in C++ code.
Anton Khirnov [Wed, 8 Aug 2012 06:04:56 +0000 (08:04 +0200)]
lavc: fix mixing CODEC_ID/AV_CODEC_ID in C++ code.

C++ does not allow to mix different enums, so e.g. code comparing
ACodecID with CodecID would fail to compile with gcc.

This very evil hack should fix this problem.

12 years agomp3/mp2: identify the video codecs as APIC through query_codec.
Michael Niedermayer [Sat, 4 Aug 2012 17:00:44 +0000 (19:00 +0200)]
mp3/mp2: identify the video codecs as APIC through query_codec.

Fixes Ticket1408

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffmpeg: dont auto match videostreams with attachment pics.
Michael Niedermayer [Sat, 4 Aug 2012 17:00:11 +0000 (19:00 +0200)]
ffmpeg: dont auto match videostreams with attachment pics.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolavf: return APIC fourcc from query_format() if the codec is supported as an attachme...
Michael Niedermayer [Sat, 4 Aug 2012 16:59:03 +0000 (18:59 +0200)]
lavf: return APIC fourcc from query_format() if the codec is supported as an attachment pic

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoiff: replace av_abort by av_assert0
Michael Niedermayer [Fri, 10 Aug 2012 14:26:39 +0000 (16:26 +0200)]
iff: replace av_abort by av_assert0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 10 Aug 2012 14:19:23 +0000 (16:19 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  g723.1: fix addition overflow
  g723.1: simplify and fix multiplication overflow
  g723.1: deobfuscate an expression
  g723.1: remove unused #includes
  ARM: add missing "cc" clobber in av_clipl_int32_arm()
  rtmp: Factorize the code by adding handle_invoke_error
  rtmp: Factorize the code by adding handle_invoke_status
  rtmp: Factorize the code by adding handle_invoke_result
  libavutil: remove unused av_abort() macro
  ffmenc: replace if/abort with assert()
  libavutil: drop offsetof() fallback definition
  libavutil: drop fallback definitions of INTxx_MIN/MAX
  configure: Check for a sctp struct instead of just the header
  configure: suncc: Add -xc99 to dependency flags, required on Solaris
  doxygen: Fix function parameter names to match the code
  doc: Drop obsolete shared libs cflags hint to workaround Cygwin gcc bugs
  swf: Move shared table out of the header file
  swf: Move swf_audio_codec_tags table to the only place it is used
  fate: add G.723.1 decoder tests

Conflicts:
configure
doc/platform.texi
libavformat/Makefile
libavutil/arm/intmath.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agodict: move struct AVDictionary definition to dict.c
Mans Rullgard [Wed, 8 Aug 2012 16:31:44 +0000 (17:31 +0100)]
dict: move struct AVDictionary definition to dict.c

This makes struct AVDictionary fully opaque now that nothing
needs to access it directly any more.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agodict: add av_dict_count()
Mans Rullgard [Wed, 8 Aug 2012 16:30:15 +0000 (17:30 +0100)]
dict: add av_dict_count()

This adds a function to retrieve the number of entries in a
dictionary and updates the places directly accessing what should
be an opaque struct to use this new function instead.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agomjpegdec: support AVRn interlaced
Michael Niedermayer [Fri, 10 Aug 2012 13:47:07 +0000 (15:47 +0200)]
mjpegdec: support AVRn interlaced

Fixes Ticket1527
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>