platform/upstream/libav.git
13 years agoconfigure: use pkg-config helpers
Mans Rullgard [Sun, 6 Mar 2011 13:50:21 +0000 (13:50 +0000)]
configure: use pkg-config helpers

This makes existing pkg-config uses as well as the libsdl checks
use the new pkg-config helper functions, which should be more
robust against broken systems.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoconfigure: improve pkg-config support
Mans Rullgard [Sun, 6 Mar 2011 13:48:30 +0000 (13:48 +0000)]
configure: improve pkg-config support

This adds helper functions for checking packages with pkg-config
and managing the associated flags.

Note that pkg-config use is still discouraged due to widespread
poor practices resulting in broken flags in many situations.  A
few badly designed packages require flags only obtainable using
pkg-config, and these functions are intended for those cases.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoconfigure: allow checking multiple functions in check_func_headers()
Mans Rullgard [Mon, 7 Mar 2011 02:49:55 +0000 (02:49 +0000)]
configure: allow checking multiple functions in check_func_headers()

This makes it possible to pass a space-separated list of functions
to check_func_headers and check_lib2.  If any function is missing,
none are enabled as available, so this should only be used for
all-or-nothing sets, i.e. groups in which none will be used if any
one is missing.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoAdd one more avc intra fourcc and extend the description
Benjamin Larsson [Wed, 9 Mar 2011 09:55:20 +0000 (10:55 +0100)]
Add one more avc intra fourcc and extend the description

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoExport profiles from the mpeg2 video decoder
Benjamin Larsson [Thu, 10 Mar 2011 10:29:56 +0000 (11:29 +0100)]
Export profiles from the mpeg2 video decoder

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoid3v2: fix typo in error message
Anton Khirnov [Mon, 7 Mar 2011 22:32:05 +0000 (22:32 +0000)]
id3v2: fix typo in error message

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoaacenc: Fix a segfault in search_for_quantizers
Nathan Caldwell [Tue, 8 Mar 2011 08:22:14 +0000 (01:22 -0700)]
aacenc: Fix a segfault in search_for_quantizers

This reverts the removal of scoefs from AACEncContext.
It resulted in scoefs being a NULL pointer when
search_for_quantizers() is called.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoavio: deprecate url_feof
Anton Khirnov [Mon, 7 Mar 2011 20:50:25 +0000 (21:50 +0100)]
avio: deprecate url_feof

AVIOContext.eof_reached should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agompegts: add all stream languages into metadata
Anssi Hannula [Thu, 17 Feb 2011 15:26:34 +0000 (17:26 +0200)]
mpegts: add all stream languages into metadata

This is used at least on some older DVB broadcasts for dual-mono audio
tracks.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoIn retry_transfer_wrapper, do not check url_interrupt_cb, causes problems
Baptiste Coudurier [Fri, 4 Mar 2011 22:43:02 +0000 (23:43 +0100)]
In retry_transfer_wrapper, do not check url_interrupt_cb, causes problems
when writing and pressing q during encoding. Instead, check url_interrupt_cb
at the end.

Note that when a protocol is interrupted by url_interrupt_cb, some data may
be silently discarded: the protocol context is not suitable for anything
anymore.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoFlag DVB subtitles for the hard hearing appropriately using their component_type id.
Hendrik Leppkes [Sun, 20 Feb 2011 01:38:23 +0000 (02:38 +0100)]
Flag DVB subtitles for the hard hearing appropriately using their component_type id.

This is based on the component_type definition in the DVB SI spec [1].

[1]: http://www.dvb.org/technology/standards/a038_DVB-SI_dEN300468v1.12.1.pdf

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agompegtsenc: handle multiple language tags per stream
Anssi Hannula [Thu, 17 Feb 2011 15:26:35 +0000 (17:26 +0200)]
mpegtsenc: handle multiple language tags per stream

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agolavf: update documentation of AVOutputFormat.flags
Anssi Hannula [Mon, 14 Feb 2011 17:14:53 +0000 (19:14 +0200)]
lavf: update documentation of AVOutputFormat.flags

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoreindent.
Ronald S. Bultje [Mon, 7 Mar 2011 18:18:57 +0000 (13:18 -0500)]
reindent.

13 years agoavio: move ff_rewind_with_probe_data from avio.h to avio_internal.h
Anton Khirnov [Sun, 6 Mar 2011 19:08:30 +0000 (20:08 +0100)]
avio: move ff_rewind_with_probe_data from avio.h to avio_internal.h

also change its prefix to ffio

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoavio: deprecate url_fget_max_packet_size
Anton Khirnov [Sun, 6 Mar 2011 17:04:49 +0000 (18:04 +0100)]
avio: deprecate url_fget_max_packet_size

AVIOContext.max_packet_size should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoaacenc: remove the data arrays
Young Han Lee [Fri, 18 Feb 2011 00:33:11 +0000 (09:33 +0900)]
aacenc: remove the data arrays

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agolavf: document the use of multiple entries in language metadata tag
Anssi Hannula [Mon, 28 Feb 2011 18:30:03 +0000 (20:30 +0200)]
lavf: document the use of multiple entries in language metadata tag

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoaac_latm_dec: use aac context and aac m4ac
Thadeu Lima de Souza Cascardo [Tue, 1 Mar 2011 12:46:12 +0000 (09:46 -0300)]
aac_latm_dec: use aac context and aac m4ac

When decoding latm config, use the corresponding aac context and its
m4ac instead of using NULL and a local variable. This fixes decoding of
audio in MPEG TS from SBTVD (the Brazillian Digital TV Sytem), when
there is no extradata. This is the case when using the decoder with
gst-ffmpeg and a GStreamer mpegts demuxer.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoac3enc: add some assertions
Justin Ruggles [Fri, 4 Mar 2011 17:12:01 +0000 (12:12 -0500)]
ac3enc: add some assertions

13 years agoac3enc: use av_assert2() instead of assert() to make debugging easier.
Justin Ruggles [Fri, 4 Mar 2011 17:11:03 +0000 (12:11 -0500)]
ac3enc: use av_assert2() instead of assert() to make debugging easier.

13 years agocosmetics: rename ff_fmt_convert_init_ppc() to ff_fmt_convert_init_altivec().
Justin Ruggles [Sat, 5 Mar 2011 03:51:51 +0000 (22:51 -0500)]
cosmetics: rename ff_fmt_convert_init_ppc() to ff_fmt_convert_init_altivec().

It only has Altivec functions and is not compiled if Altivec is disabled.

13 years agoFix compilation on powerpc with --disable-altivec.
Carl Eugen Hoyos [Sat, 5 Mar 2011 03:05:16 +0000 (22:05 -0500)]
Fix compilation on powerpc with --disable-altivec.

13 years agoAdd audio codec 0x1600 (ADTS AAC)
Peter Ross [Sun, 6 Mar 2011 11:05:04 +0000 (22:05 +1100)]
Add audio codec 0x1600 (ADTS AAC)

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoavio: avio_ prefix for url_fsize
Anton Khirnov [Fri, 4 Mar 2011 18:57:36 +0000 (19:57 +0100)]
avio: avio_ prefix for url_fsize

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoavio: deprecate url_fgetc and remove all it uses
Anton Khirnov [Sun, 6 Mar 2011 18:59:29 +0000 (19:59 +0100)]
avio: deprecate url_fgetc and remove all it uses

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoavio: deprecate url_fgets
Anton Khirnov [Sun, 6 Mar 2011 17:04:46 +0000 (18:04 +0100)]
avio: deprecate url_fgets

It's not used anywhere and doesn't look ver useful to be public.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoavio: add avio_skip macro
Peter Ross [Thu, 3 Mar 2011 11:37:05 +0000 (22:37 +1100)]
avio: add avio_skip macro

This is a substitute for the url_fskip function that was deprecated by
commit 0300db8ad778a194b4a8ec98f6da3de5b41c46ee. avio_fskip is provided to
improve demuxer code readability. It distinguishes the act of skipping over
unknown or irrelevant bytes from the standard avio_seek operation.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoh264_mp3toannexb_bsg: don't crash, but warn, if PPS/SPS not found.
Sean McGovern [Fri, 4 Mar 2011 03:22:43 +0000 (22:22 -0500)]
h264_mp3toannexb_bsg: don't crash, but warn, if PPS/SPS not found.

Should an AVC-1 in MP4 stream not contain SPS or PPS NAL units,
this BSF is then unable to allocate an output buffer for the
modified stream. Warn that the resulting stream may be unplayable.

Fix roundup issue #2386.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoAdd Apple HTTP Live Streaming protocol handler
Martin Storsjö [Thu, 22 Jul 2010 07:30:15 +0000 (10:30 +0300)]
Add Apple HTTP Live Streaming protocol handler

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
13 years agoURLProtocol: Add URL_PROTOCOL_FLAG_NESTED_SCHEME
Martin Storsjö [Mon, 28 Feb 2011 13:39:36 +0000 (15:39 +0200)]
URLProtocol: Add URL_PROTOCOL_FLAG_NESTED_SCHEME

If this flag is set, the protocol can handle URLs where the
scheme is a nested scheme such as applehttp+file: - the protocol
can handle any URL where the first segment of the nested scheme
belongs to this protocol.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
13 years agoURLProtocol: Add a flags field
Martin Storsjö [Mon, 28 Feb 2011 13:39:17 +0000 (15:39 +0200)]
URLProtocol: Add a flags field

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
13 years agoyadif: add parens around macro parameters
Mans Rullgard [Thu, 24 Feb 2011 21:25:53 +0000 (21:25 +0000)]
yadif: add parens around macro parameters

This fixes compilation with preprocessors which do not add whitespace
around replaced tokens, resulting in invalid expressions like 1--1.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoac3enc: add num_rematrixing_bands to AC3EncodeContext and use it instead of the hardc...
Justin Ruggles [Fri, 4 Mar 2011 21:41:49 +0000 (16:41 -0500)]
ac3enc: add num_rematrixing_bands to AC3EncodeContext and use it instead of the hardcoded value.

Currently it is always 4, but this change will allow it to be adjusted when
bandwidth-related features are added such as channel coupling, enhanced
channel coupling, and spectral extension.

13 years agoac3: define AC3_MAX_CPL_BANDS and use it in ac3dec.h
Justin Ruggles [Fri, 4 Mar 2011 21:25:17 +0000 (16:25 -0500)]
ac3: define AC3_MAX_CPL_BANDS and use it in ac3dec.h

13 years agoavio: add avio_tell macro as a replacement for url_ftell
Anton Khirnov [Thu, 3 Mar 2011 19:11:45 +0000 (20:11 +0100)]
avio: add avio_tell macro as a replacement for url_ftell

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agolavf: deprecate get_strz() in favor of avio_get_str
Anton Khirnov [Wed, 2 Mar 2011 16:48:45 +0000 (17:48 +0100)]
lavf: deprecate get_strz() in favor of avio_get_str

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoavio: add avio_get_str()
Reimar Döffinger [Thu, 3 Mar 2011 12:51:55 +0000 (13:51 +0100)]
avio: add avio_get_str()

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoavio: fix fourcc if any character is >=0x80.
Ronald S. Bultje [Fri, 4 Mar 2011 13:33:49 +0000 (08:33 -0500)]
avio: fix fourcc if any character is >=0x80.

Fixes issue 2638.

13 years agovp3-mt: fix deadlock when first frame is not a keyframe.
Ronald S. Bultje [Wed, 2 Mar 2011 17:15:07 +0000 (12:15 -0500)]
vp3-mt: fix deadlock when first frame is not a keyframe.

13 years agothreads: allow thread count of zero
Mans Rullgard [Wed, 2 Mar 2011 13:08:15 +0000 (13:08 +0000)]
threads: allow thread count of zero

This moves setting the thread count to a minimum of 1 to
frame_thread_init(), allowing a value of zero to propagate
through to the codec if frame threading is not used.  This
makes auto-threads work in libx264.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agovc1: fix decoding when end sequence is present
Baptiste Coudurier [Wed, 2 Mar 2011 11:17:33 +0000 (11:17 +0000)]
vc1: fix decoding when end sequence is present

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoffmpeg: Use av_pkt_dump_log2
Martin Storsjö [Thu, 24 Feb 2011 08:08:07 +0000 (10:08 +0200)]
ffmpeg: Use av_pkt_dump_log2

This makes dumped packet timestamps proper for streams with
timebases other than AV_TIME_BASE.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
13 years agolibavformat: Add av_pkt_dump{, _log}2, taking an AVStream parameter
Martin Storsjö [Thu, 24 Feb 2011 08:08:06 +0000 (10:08 +0200)]
libavformat: Add av_pkt_dump{, _log}2, taking an AVStream parameter

This removes a fixme issue, by allowing the av_pkt_dump functions
to use the correct time base.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
13 years agoaviobuf: Write new data at s->buf_end in fill_buffer
Martin Storsjö [Sat, 26 Feb 2011 23:02:32 +0000 (01:02 +0200)]
aviobuf: Write new data at s->buf_end in fill_buffer

In most cases, s->buf_ptr will be equal to s->buf_end when
fill_buffer is called, but this may not always be the case, if
we're seeking forward by reading (permitted by the short seek
threshold).

If fill_buffer is writing to s->buf_ptr instead of s->buf_end (when
they aren't equal and s->buf_ptr is ahead of s->buffer), the data
between s->buf_ptr and s->buf_end is overwritten, leading to
inconsistent buffer content. This could return incorrect data if
later seeking back into the area before the current s->buf_ptr.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
13 years agomovenc: use correct tag for dvcpro hd
Baptiste Coudurier [Tue, 1 Mar 2011 23:54:29 +0000 (23:54 +0000)]
movenc: use correct tag for dvcpro hd

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agodnxhd: allow encoding with Avid Nitris compatibility.
Baptiste Coudurier [Tue, 1 Mar 2011 23:50:25 +0000 (23:50 +0000)]
dnxhd: allow encoding with Avid Nitris compatibility.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agomovenc: fix tkhd height for imx
Baptiste Coudurier [Tue, 1 Mar 2011 23:36:48 +0000 (23:36 +0000)]
movenc: fix tkhd height for imx

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoavio: deprecate url_fskip
Anton Khirnov [Mon, 28 Feb 2011 13:57:56 +0000 (14:57 +0100)]
avio: deprecate url_fskip

avio_seek should be used instead

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agolavf: replace all uses of url_fskip with avio_seek
Anton Khirnov [Mon, 28 Feb 2011 13:57:55 +0000 (14:57 +0100)]
lavf: replace all uses of url_fskip with avio_seek

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoavio: avio_ prefix for url_fseek
Anton Khirnov [Mon, 28 Feb 2011 13:57:54 +0000 (14:57 +0100)]
avio: avio_ prefix for url_fseek

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agohuffyuv: Add multithreading support
Alexander Strange [Thu, 17 Feb 2011 08:44:25 +0000 (03:44 -0500)]
huffyuv: Add multithreading support

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agopthreads: Fix bug introduced with thread_safe_callbacks
Alexander Strange [Thu, 17 Feb 2011 08:25:00 +0000 (03:25 -0500)]
pthreads: Fix bug introduced with thread_safe_callbacks

For intra codecs, ff_thread_finish_setup() is called before decoding starts
automatically. However, get_buffer can only be used before it's called, so
adding this requirement broke frame threading for them. Fixed by moving the
call until after get_buffer is finished.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoUse --sysroot flag for clang
Mans Rullgard [Sun, 27 Feb 2011 23:34:38 +0000 (23:34 +0000)]
Use --sysroot flag for clang

Although not documented, clang does support the --sysroot flag, and it
does the right thing.  Use this flag intead of -isysroot which only
applies to header file searches, not the linker.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoARM: VP8: fix build on systems with global symbol prefix
Mans Rullgard [Sat, 26 Feb 2011 18:05:53 +0000 (18:05 +0000)]
ARM: VP8: fix build on systems with global symbol prefix

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoARM: fix vp8 neon with pic enabled
Mans Rullgard [Sat, 26 Feb 2011 18:04:53 +0000 (18:04 +0000)]
ARM: fix vp8 neon with pic enabled

The assembler emits literal pools too far from the load instructions,
so we must do it explicitly at a suitable location.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoconfigure: document FATE_SAMPLES env var in --help text
Reimar Döffinger [Sat, 26 Feb 2011 11:50:35 +0000 (11:50 +0000)]
configure: document FATE_SAMPLES env var in --help text

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agofate: get samples location from env var if not explicitly set
Mans Rullgard [Sat, 26 Feb 2011 11:51:18 +0000 (11:51 +0000)]
fate: get samples location from env var if not explicitly set

Use the FATE_SAMPLES environment variable if samples location
is not set with the --samples configure option or on the make
command line.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agomovenc: remove uses of deprecated API.
Ronald S. Bultje [Fri, 25 Feb 2011 22:41:00 +0000 (17:41 -0500)]
movenc: remove uses of deprecated API.

Replace put_tag() with ffio_wfourcc() and ByteIOContext with AVIOContext.

13 years agostore pasp atom for all types of quicktime movie
Maksym Veremeyenko [Tue, 15 Feb 2011 10:44:08 +0000 (12:44 +0200)]
store pasp atom for all types of quicktime movie

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
13 years agoreindent after tapt patch
Maksym Veremeyenko [Fri, 25 Feb 2011 15:42:56 +0000 (17:42 +0200)]
reindent after tapt patch

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
13 years agouse tapt atom for sample aspect ratio
Maksym Veremeyenko [Fri, 25 Feb 2011 15:41:55 +0000 (17:41 +0200)]
use tapt atom for sample aspect ratio

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
13 years agobink: prevent overflows within binkidct by using int-sized intermediate array
Peter Ross [Sun, 13 Feb 2011 03:37:20 +0000 (14:37 +1100)]
bink: prevent overflows within binkidct by using int-sized intermediate array

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agobink: decode audio track identifiers into AVStream.id
Peter Ross [Sun, 20 Feb 2011 02:15:38 +0000 (13:15 +1100)]
bink: decode audio track identifiers into AVStream.id

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoBink version 'b' audio decoder
Peter Ross [Sun, 20 Feb 2011 01:25:05 +0000 (12:25 +1100)]
Bink version 'b' audio decoder

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agobinkaudio: simplify frame_len_bits and frame_len calculation
Peter Ross [Sun, 20 Feb 2011 01:24:48 +0000 (12:24 +1100)]
binkaudio: simplify frame_len_bits and frame_len calculation

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agobinkaudio: remove unnecessary loop
Peter Ross [Sun, 20 Feb 2011 01:24:38 +0000 (12:24 +1100)]
binkaudio: remove unnecessary loop

decode_init sets bands[0] == 2, so this loop always sets the band table
index (k) to zero.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agobinkaudio: perform band table scaling in decode_init
Peter Ross [Sun, 20 Feb 2011 01:24:25 +0000 (12:24 +1100)]
binkaudio: perform band table scaling in decode_init

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agobink: set audio stream codec_tag such that binkaudio decoder can identify bitstream...
Peter Ross [Sun, 20 Feb 2011 01:24:09 +0000 (12:24 +1100)]
bink: set audio stream codec_tag such that binkaudio decoder can identify bitstream version

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agobink: use LOCAL_ALIGNED for aligned stack data
Mans Rullgard [Fri, 25 Feb 2011 14:52:23 +0000 (14:52 +0000)]
bink: use LOCAL_ALIGNED for aligned stack data

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agodxva2: define required feature selection macros
Kyle [Sat, 19 Feb 2011 00:42:11 +0000 (00:42 +0000)]
dxva2: define required feature selection macros

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoOS/2: lxlite should use stdout
Dave Yeo [Fri, 25 Feb 2011 04:19:32 +0000 (04:19 +0000)]
OS/2: lxlite should use stdout

This causes lxlite to use stdout instead of vioXXX
functions. This improves fate and build logs readability.
Affects OS/2 only.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoavio: deprecate put_tag
Anton Khirnov [Thu, 24 Feb 2011 06:36:05 +0000 (07:36 +0100)]
avio: deprecate put_tag

it's not used internally anymore and shouldn't be public.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agolavf: replace remaining uses of put_tag with avio_write
Anton Khirnov [Thu, 24 Feb 2011 06:36:04 +0000 (07:36 +0100)]
lavf: replace remaining uses of put_tag with avio_write

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoavienc: replace &tag[0] with tag.
Anton Khirnov [Thu, 24 Feb 2011 06:36:03 +0000 (07:36 +0100)]
avienc: replace &tag[0] with tag.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agolavf: use a new ffio_wfourcc macro instead of put_tag() where possible
Anton Khirnov [Thu, 24 Feb 2011 06:36:02 +0000 (07:36 +0100)]
lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agodca: use EXT_AUDIO_ID field to determine core extensions
Anssi Hannula [Fri, 18 Feb 2011 19:49:44 +0000 (19:49 +0000)]
dca: use EXT_AUDIO_ID field to determine core extensions

This avoids the core substream extensions scan when the EXT_AUDIO_ID
field indicates no extensions or only unsupported extensions. The scan
is done only if the value of EXT_AUDIO_ID is unknown or indicates a
present XCh extension which we can decode.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agovmdaudio: output 8-bit audio as AV_SAMPLE_FMT_U8.
Justin Ruggles [Wed, 23 Feb 2011 18:11:13 +0000 (13:11 -0500)]
vmdaudio: output 8-bit audio as AV_SAMPLE_FMT_U8.

There is no need to expand to 16-bits. Just use memcpy() to copy the raw data.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agovmdaudio: remove unnecessary fields from VmdAudioContext and use the corresponding...
Justin Ruggles [Wed, 23 Feb 2011 18:11:12 +0000 (13:11 -0500)]
vmdaudio: remove unnecessary fields from VmdAudioContext and use the corresponding AVCodecContext fields instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agovmdaudio: add out_bps to VmdAudioContext and use it to replace hard-coded sample...
Justin Ruggles [Wed, 23 Feb 2011 18:11:11 +0000 (13:11 -0500)]
vmdaudio: add out_bps to VmdAudioContext and use it to replace hard-coded sample size.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agovmdaudio: simplify vmdaudio_decode_frame() by handling block_type first, then making...
Justin Ruggles [Wed, 23 Feb 2011 18:11:10 +0000 (13:11 -0500)]
vmdaudio: simplify vmdaudio_decode_frame() by handling block_type first, then making a single call to vmdaudio_loadsound().

This also adds output buffer size checks for AUDIO and SILENCE block types.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agocosmetics: reindent after previous commit
Justin Ruggles [Wed, 23 Feb 2011 18:11:09 +0000 (13:11 -0500)]
cosmetics: reindent after previous commit

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agovmdaudio: move all silence chunk handling to vmdaudio_loadsound().
Justin Ruggles [Wed, 23 Feb 2011 18:11:08 +0000 (13:11 -0500)]
vmdaudio: move all silence chunk handling to vmdaudio_loadsound().

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agocosmetics: remove debugging cruft
Justin Ruggles [Wed, 23 Feb 2011 18:11:01 +0000 (13:11 -0500)]
cosmetics: remove debugging cruft

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agocosmetics: reindent after previous commit
Justin Ruggles [Wed, 23 Feb 2011 18:11:00 +0000 (13:11 -0500)]
cosmetics: reindent after previous commit

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agovmdaudio: simplify buffer pointer and header size handling.
Justin Ruggles [Wed, 23 Feb 2011 18:11:07 +0000 (13:11 -0500)]
vmdaudio: simplify buffer pointer and header size handling.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agovmdaudio: set *data_size to zero when skipping small packets and add a warning log...
Justin Ruggles [Wed, 23 Feb 2011 18:11:06 +0000 (13:11 -0500)]
vmdaudio: set *data_size to zero when skipping small packets and add a warning log message.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agovmdaudio: validate block type
Justin Ruggles [Wed, 23 Feb 2011 18:11:05 +0000 (13:11 -0500)]
vmdaudio: validate block type

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agovmdaudio: use macros and a local variable for block type.
Justin Ruggles [Wed, 23 Feb 2011 18:11:04 +0000 (13:11 -0500)]
vmdaudio: use macros and a local variable for block type.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agovmdaudio: correct the silent chunk count in the first block.
Justin Ruggles [Wed, 23 Feb 2011 18:11:03 +0000 (13:11 -0500)]
vmdaudio: correct the silent chunk count in the first block.

This fixes A/V sync with several samples, notably:
http://samples.mplayerhq.hu/game-formats/sierra-vmd/swat_*.vmd

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agovmdaudio: output audio samples for standalone silent blocks.
Justin Ruggles [Wed, 23 Feb 2011 18:11:02 +0000 (13:11 -0500)]
vmdaudio: output audio samples for standalone silent blocks.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agovmdaudio: remove duplicated code by merging mono and stereo decoding.
Justin Ruggles [Wed, 23 Feb 2011 18:10:59 +0000 (13:10 -0500)]
vmdaudio: remove duplicated code by merging mono and stereo decoding.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agovmdaudio: fix raw_block_size calculation.
Justin Ruggles [Wed, 23 Feb 2011 18:10:58 +0000 (13:10 -0500)]
vmdaudio: fix raw_block_size calculation.

The size should depend on the output sample size, not the internal bit depth.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoavienc: fix AVI stream index for files with >10 streams
longstone [Wed, 23 Feb 2011 15:43:21 +0000 (10:43 -0500)]
avienc: fix AVI stream index for files with >10 streams

Fixes issue 2563.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoavio: rename url_fopen/fclose -> avio_open/close.
Anton Khirnov [Mon, 21 Feb 2011 21:45:20 +0000 (22:45 +0100)]
avio: rename url_fopen/fclose -> avio_open/close.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agolibavformat: Remove FF_NETERRNO()
Martin Storsjö [Sat, 19 Feb 2011 18:14:11 +0000 (19:14 +0100)]
libavformat: Remove FF_NETERRNO()

Map EAGAIN and EINTR from ff_neterrno to the normal AVERROR()
error codes. Provide fallback definitions of other errno.h network
errors, mapping them to the corresponding winsock errors.

This eases catching these error codes in common code, without having
to distinguish between FF_NETERRNO(EAGAIN) and AVERROR(EAGAIN).

This fixes roundup issue 2614, unbreaking blocking network IO on
windows.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoAdd more AVC Intra FOURCCs
Benjamin Larsson [Tue, 8 Feb 2011 10:05:05 +0000 (11:05 +0100)]
Add more AVC Intra FOURCCs

Also change the comments a bit since the FOURCCs aren't specific to Flip4Mac
and different ones are used for 720 versus 1080 lines.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoaacdec: Reduce the size of buf_mdct.
Young Han Lee [Wed, 16 Feb 2011 01:04:07 +0000 (10:04 +0900)]
aacdec: Reduce the size of buf_mdct.

It was doubled in size for the LTP implementation. This brings it back
down to its original size.

13 years agoRemove old VCSs from version.sh
Alex Converse [Mon, 21 Feb 2011 08:01:09 +0000 (00:01 -0800)]
Remove old VCSs from version.sh

13 years agompegtsenc: use correct PES stream_id for AAC
Tony Strauss [Mon, 21 Feb 2011 23:46:54 +0000 (23:46 +0000)]
mpegtsenc: use correct PES stream_id for AAC

This adds the AAC codec to the list of audio codecs that results
in a PES stream_id of 0xc0 (audio stream).

Signed-off-by: Mans Rullgard <mans@mansr.com>