ffmpeg.git
9 years agolavf: make av_interleave_packet() return meaningful error codes
Stefano Sabatini [Tue, 15 Mar 2011 12:03:03 +0000 (13:03 +0100)]
lavf: make av_interleave_packet() return meaningful error codes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf: enable av_dlog() in compute_pkt_fields2()
Stefano Sabatini [Tue, 15 Mar 2011 12:11:57 +0000 (13:11 +0100)]
lavf: enable av_dlog() in compute_pkt_fields2()

Turns a comment into an av_dlog() instruction, also add a commented
issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf: enable av_dlog message in av_interleaved_write_frame()
Stefano Sabatini [Tue, 15 Mar 2011 12:12:15 +0000 (13:12 +0100)]
lavf: enable av_dlog message in av_interleaved_write_frame()

Help debugging timestamp issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix compilation error when CONFIG_AVFILTER is not defined.
Thierry Foucu [Wed, 16 Mar 2011 20:37:41 +0000 (13:37 -0700)]
Fix compilation error when CONFIG_AVFILTER is not defined.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomatroskadec: set a default duration also for packets comming from a simple block
Aurelien Jacobs [Wed, 16 Mar 2011 22:37:16 +0000 (23:37 +0100)]
matroskadec: set a default duration also for packets comming from a simple block

9 years agoUse av_strdup instead of strdup, fixes mingw build
Baptiste Coudurier [Wed, 16 Mar 2011 21:26:25 +0000 (14:26 -0700)]
Use av_strdup instead of strdup, fixes mingw build

9 years agoRemove occurrences of my old email address.
Ramiro Polla [Wed, 16 Mar 2011 18:40:33 +0000 (15:40 -0300)]
Remove occurrences of my old email address.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoDo not attempt to decode APE file with no frames.
Kostya Shishkov [Tue, 15 Mar 2011 19:37:37 +0000 (20:37 +0100)]
Do not attempt to decode APE file with no frames.

This fixes invalid reads/writes with this sample:
http://packetstorm.linuxsecurity.com/1103-exploits/vlc105-dos.txt

9 years agoMerge remote-tracking branch 'newdev/master'
Michael Niedermayer [Tue, 15 Mar 2011 15:18:40 +0000 (16:18 +0100)]
Merge remote-tracking branch 'newdev/master'

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoRevert "ac3enc: shift coefficients to 24-bit following MDCT rather than using an...
Michael Niedermayer [Tue, 15 Mar 2011 14:12:17 +0000 (15:12 +0100)]
Revert "ac3enc: shift coefficients to 24-bit following MDCT rather than using an exponent offset."

This reverts commit 7e0a284b9f1967d46603711e85e0be01e084eadf.
revert at authors request due to better impementation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoRevert "ac3enc: add SIMD-optimized shifting functions for use with the fixed-point...
Michael Niedermayer [Tue, 15 Mar 2011 14:11:22 +0000 (15:11 +0100)]
Revert "ac3enc: add SIMD-optimized shifting functions for use with the fixed-point AC3 encoder"

This reverts commit cc4d3dd3e2171f63cd4297292349b58788fff260.
revert at authors request due to better impementation being available

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoUse AVERROR_EXIT with url_interrupt_cb.
Nicolas George [Sat, 12 Mar 2011 23:42:27 +0000 (00:42 +0100)]
Use AVERROR_EXIT with url_interrupt_cb.

Functions interrupted by url_interrupt_cb should not be restarted.
Therefore using AVERROR(EINTR) was wrong, as it did not allow to distinguish
when the underlying system call was interrupted and actually needed to be
restarted.

This fixes roundup issues 2657 and 2659 (ffplay not exiting for streamed
content).

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoAdd AVERROR_EXIT.
Nicolas George [Sat, 12 Mar 2011 23:42:26 +0000 (00:42 +0100)]
Add AVERROR_EXIT.

This is different from AVERROR(EINTR) because calls that fail with EINTR
should usually be restarted.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoavio: deprecate url_ferror
Anton Khirnov [Mon, 14 Mar 2011 19:38:55 +0000 (20:38 +0100)]
avio: deprecate url_ferror

AVIOContext.error should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agolavf/utils: dont't explicitly check AVIOContext.error
Anton Khirnov [Mon, 14 Mar 2011 19:38:54 +0000 (20:38 +0100)]
lavf/utils: dont't explicitly check AVIOContext.error

The error should be caught in write_packet()/write_trailer()

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoh264_mp4toannexb_bsf: Fix spurious warning when stream has SPS and PPS units.
Philip Langdale [Tue, 15 Mar 2011 05:14:22 +0000 (22:14 -0700)]
h264_mp4toannexb_bsf: Fix spurious warning when stream has SPS and PPS units.

Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoDelete MAINTAINERS file
Mans Rullgard [Mon, 14 Mar 2011 17:15:34 +0000 (17:15 +0000)]
Delete MAINTAINERS file

This file is a bad idea and also badly outdated.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoac3enc: add SIMD-optimized shifting functions for use with the fixed-point AC3 encoder.
Justin Ruggles [Fri, 11 Mar 2011 21:45:01 +0000 (16:45 -0500)]
ac3enc: add SIMD-optimized shifting functions for use with the fixed-point AC3 encoder.

9 years agoac3enc: do not right-shift fixed-point coefficients in the final MDCT stage.
Justin [Fri, 11 Mar 2011 18:03:26 +0000 (13:03 -0500)]
ac3enc: do not right-shift fixed-point coefficients in the final MDCT stage.

This increases the accuracy of coefficients, leading to improved quality.
Rescaling of the coefficients to full 25-bit accuracy is done rather than
offsetting the exponent values. This requires coefficient scaling to be done
before determining the rematrixing strategy. Also, the rematrixing strategy
calculation must use 64-bit math to prevent overflow due to the higher
precision coefficients.

9 years agomm decoder: move buffer allocation from decode_init() to decode_frame()
Peter Ross [Sun, 13 Mar 2011 05:27:05 +0000 (16:27 +1100)]
mm decoder: move buffer allocation from decode_init() to decode_frame()

This permits playback in ffplay when libavfilter is enabled.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agojv demuxer: prevent video packet size overflow
Peter Ross [Sun, 13 Mar 2011 05:15:38 +0000 (16:15 +1100)]
jv demuxer: prevent video packet size overflow

In the event of overflow, the JV_PADDING state will avio_skip over
any overflow bytes (using JVFrame.total_size).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agojv demuxer: define JV_PREAMBLE_SIZE instead of hard coding the number
Peter Ross [Sat, 12 Mar 2011 02:31:40 +0000 (13:31 +1100)]
jv demuxer: define JV_PREAMBLE_SIZE instead of hard coding the number

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agojv demuxer: calculate palette_size for each frame in read_header
Peter Ross [Sat, 12 Mar 2011 02:31:26 +0000 (13:31 +1100)]
jv demuxer: calculate palette_size for each frame in read_header

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoBitmap Brothers JV errata
Peter Ross [Tue, 8 Mar 2011 15:11:10 +0000 (02:11 +1100)]
Bitmap Brothers JV errata

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoBitmap Brothers JV demuxer
Peter Ross [Thu, 10 Mar 2011 12:29:22 +0000 (23:29 +1100)]
Bitmap Brothers JV demuxer

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoBitmap Brothers JV video decoder
Peter Ross [Thu, 10 Mar 2011 12:23:25 +0000 (23:23 +1100)]
Bitmap Brothers JV video decoder

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoUpdate the url to the site website and change ffmpeg-devel to libav-devel
Johan Andersson [Sun, 13 Mar 2011 22:29:19 +0000 (23:29 +0100)]
Update the url to the site website and change ffmpeg-devel to libav-devel

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agodoc: document applehttp protocol
Luca Barbato [Wed, 9 Mar 2011 09:11:53 +0000 (10:11 +0100)]
doc: document applehttp protocol

The documentation might be extended once/if a live/store override option
will have to be provided for non-compliant segmenter.

9 years agomm decoder: move buffer allocation from decode_init() to decode_frame().
Peter Ross [Sun, 13 Mar 2011 05:21:52 +0000 (16:21 +1100)]
mm decoder: move buffer allocation from decode_init() to decode_frame().

this permits playback in ffplay when libavfilter is enabled.

9 years agojv demuxer: prevent video packet size overflow
Peter Ross [Sat, 12 Mar 2011 02:12:05 +0000 (13:12 +1100)]
jv demuxer: prevent video packet size overflow

In the event of overflow, the JV_PADDING state will avio_skip over
any overflow bytes (using JVFrame.total_size).

9 years agofbdev: fix check on nanosleep return vale
Stefano Sabatini [Sat, 12 Mar 2011 13:46:16 +0000 (14:46 +0100)]
fbdev: fix check on nanosleep return vale

In fbdev_read_packet(): nanosleep returns -1 in case of errors,
the EINTR check has to be done on errno.

Spotted by Nicolas.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agojv demuxer: define JV_PREAMBLE_SIZE instead of hard coding the number
Peter Ross [Sat, 12 Mar 2011 02:31:40 +0000 (13:31 +1100)]
jv demuxer: define JV_PREAMBLE_SIZE instead of hard coding the number

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agojv demuxer: calculate palette_size for each frame in read_header
Peter Ross [Sat, 12 Mar 2011 02:31:26 +0000 (13:31 +1100)]
jv demuxer: calculate palette_size for each frame in read_header

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoVP8: fix other function declaration
Jason Garrett-Glaser [Sat, 12 Mar 2011 23:30:18 +0000 (15:30 -0800)]
VP8: fix other function declaration

Was missed in 3efbe137.

9 years agoRevert "configure: allow checking multiple functions in check_func_headers()"
Michael Niedermayer [Sat, 12 Mar 2011 18:14:55 +0000 (19:14 +0100)]
Revert "configure: allow checking multiple functions in check_func_headers()"

This reverts commit edaf1ae2763ce1a23dec70e730ba2bb8ee476dfd.

breaks windows builds

9 years agoRevert "configure: improve pkg-config support"
Michael Niedermayer [Sat, 12 Mar 2011 18:14:49 +0000 (19:14 +0100)]
Revert "configure: improve pkg-config support"

This reverts commit 3f8040db3e13c3dbdf07c74d92ca34817a69f733.

breaks windows builds

9 years agoRevert "configure: use pkg-config helpers"
Michael Niedermayer [Sat, 12 Mar 2011 18:14:25 +0000 (19:14 +0100)]
Revert "configure: use pkg-config helpers"

This reverts commit 4fa18c5666de24316710df670e44d4850e0796a7.

breaks windows builds

9 years agoMerge branch 'master' of git://git.ffmpeg.org/ffmpeg
Michael Niedermayer [Sat, 12 Mar 2011 16:55:59 +0000 (17:55 +0100)]
Merge branch 'master' of git://git.ffmpeg.org/ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoVC1: Export profile/level
Hendrik Leppkes [Fri, 11 Mar 2011 22:12:04 +0000 (23:12 +0100)]
VC1: Export profile/level

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoffmpeg: remove unused variable in ffmpeg_exit()
Stefano Sabatini [Sat, 12 Mar 2011 11:17:52 +0000 (11:17 +0000)]
ffmpeg: remove unused variable in ffmpeg_exit()

Fix the warning:
ffmpeg.c: In function ‘ffmpeg_exit’:
ffmpeg.c:509: warning: unused variable ‘j’

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoVP8: optimize VP8Context struct ordering
Jason Garrett-Glaser [Fri, 11 Mar 2011 21:43:10 +0000 (13:43 -0800)]
VP8: optimize VP8Context struct ordering

Shaves at least 3KB off code size on x86, should improve cache utilization.
This would probably be useful to do for other decoders/encoders as well.

9 years agoVP8: fix function declaration
Jason Garrett-Glaser [Thu, 10 Mar 2011 03:53:52 +0000 (19:53 -0800)]
VP8: fix function declaration

9 years agoVP8: token probs doesn't need padding
Jason Garrett-Glaser [Thu, 10 Mar 2011 03:54:05 +0000 (19:54 -0800)]
VP8: token probs doesn't need padding

prob[0] is the only prob array ever accessed, so prob[1] can serve as padding
for prob[0].

9 years agoVP8: use a goto to break out of two loops
Jason Garrett-Glaser [Wed, 9 Mar 2011 21:46:23 +0000 (13:46 -0800)]
VP8: use a goto to break out of two loops

A break statement was supposed to break out of two loops, but only broke out of one.
Didn't affect output, just could have been marginally slower.

9 years agoAdd CONFIG_AC3DSP symbol to simplify makefiles
Mans Rullgard [Fri, 11 Mar 2011 23:37:00 +0000 (23:37 +0000)]
Add CONFIG_AC3DSP symbol to simplify makefiles

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 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>
9 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>
9 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>
9 years agoMerge remote-tracking branch 'remotes/newdev/master'
Michael Niedermayer [Fri, 11 Mar 2011 13:59:51 +0000 (14:59 +0100)]
Merge remote-tracking branch 'remotes/newdev/master'

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoRevert "ac3enc: use MUL64() to multiply fixed-point coefficients"
Michael Niedermayer [Wed, 9 Mar 2011 18:50:36 +0000 (19:50 +0100)]
Revert "ac3enc: use MUL64() to multiply fixed-point coefficients"

Author says, this is unneeded.

This reverts commit 67fc32ac6197a7fe265795d0bf60bf704464394e.

9 years agoFix av_find_best_stream when providing a wanted stream
Marton Balint [Sun, 20 Feb 2011 00:18:30 +0000 (01:18 +0100)]
Fix av_find_best_stream when providing a wanted stream

In the main loop, stream_number is incremented after checking the stream type,
so the search usually will not find the wanted stream.

This patch eliminates the useless stream_number variable and introduces a new
one, called real_stream_index to store the real stream index of the current
stream, no matter if we are looping through all the streams or only the streams
of a program.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix av_find_best_stream when decoder_ret is given and using a related stream
Marton Balint [Sun, 20 Feb 2011 00:18:49 +0000 (01:18 +0100)]
Fix av_find_best_stream when decoder_ret is given and using a related stream

Yet another fix for the code originally designed for use without related_stream.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoBitmap Brothers JV errata
Peter Ross [Tue, 8 Mar 2011 15:11:10 +0000 (02:11 +1100)]
Bitmap Brothers JV errata

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoBitmap Brothers JV demuxer
Peter Ross [Thu, 10 Mar 2011 12:29:22 +0000 (23:29 +1100)]
Bitmap Brothers JV demuxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoBitmap Brothers JV video decoder
Peter Ross [Thu, 10 Mar 2011 12:23:25 +0000 (23:23 +1100)]
Bitmap Brothers JV video decoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoAdd avio_skip()
Michael Niedermayer [Fri, 11 Mar 2011 11:24:53 +0000 (12:24 +0100)]
Add avio_skip()

9 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>
9 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>
9 years agoCrystalHD decoder support v7
Philip Langdale [Thu, 10 Mar 2011 06:09:00 +0000 (22:09 -0800)]
CrystalHD decoder support v7

The Broadcom CrystalHD decoder chips provide hardware video
decoding for a number of video formats. It does so using a
memory:memory interface where a compressed bitstream is fed
in and decompressed pictures are copied out. As such, it works
independent of any graphics hardware in the system.

Features supported in this initial version:
* Support for Linux (using current drivers/library from git.wilsonet.com)
* Support for 70015 hardware
* Formats: MPEG2, MPEG4 Part 2, H.264, VC1 and DivX 3.11 (untested)
* Progressive content
* Non-H.264 Interlaced content
* H.264 MBAFF content

Features missing in this initial version:
* Support for OSX (might work - untested)
* Support for Windows
* Support for 70012 hardware
* H.264 PAFF content

Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffplay: Continue if the file was appended to.
Michael Niedermayer [Thu, 10 Mar 2011 18:56:27 +0000 (19:56 +0100)]
ffplay: Continue if the file was appended to.
This is a bit experimental

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix url_feof() for file appendings.
Michael Niedermayer [Thu, 10 Mar 2011 12:21:52 +0000 (13:21 +0100)]
Fix url_feof() for file appendings.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'remotes/newdev/master'
Michael Niedermayer [Wed, 9 Mar 2011 17:55:51 +0000 (18:55 +0100)]
Merge remote-tracking branch 'remotes/newdev/master'

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 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>
(cherry picked from commit fb61a7c5343a23d845ab73dd28caf6ec98cd6101)

9 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>
9 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>
9 years agoDo not use AVFMT_FLAG_NONBLOCK for the output file.
Carl Eugen Hoyos [Tue, 8 Mar 2011 19:45:26 +0000 (20:45 +0100)]
Do not use AVFMT_FLAG_NONBLOCK for the output file.

Allows to use output device alsa.

9 years agoac3enc: add SIMD-optimized shifting functions for use with the fixed-point AC3 encoder
Justin Ruggles [Tue, 8 Mar 2011 18:18:57 +0000 (13:18 -0500)]
ac3enc: add SIMD-optimized shifting functions for use with the fixed-point AC3 encoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoac3enc: shift coefficients to 24-bit following MDCT rather than using an exponent...
Justin Ruggles [Tue, 8 Mar 2011 18:18:56 +0000 (13:18 -0500)]
ac3enc: shift coefficients to 24-bit following MDCT rather than using an exponent offset.

This makes channel coupling more accurate, increasing quality for stereo
content.  It also simplifies exponent extraction and mantissa quantization
by no longer needing to apply an offset to the exponents.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoac3enc: use MUL64() to multiply fixed-point coefficients
Justin Ruggles [Tue, 8 Mar 2011 18:18:55 +0000 (13:18 -0500)]
ac3enc: use MUL64() to multiply fixed-point coefficients

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoAdd a dummy option -i to ffplay so that it is easy to switch between ffmpeg -i "file...
Benjamin Larsson [Tue, 8 Mar 2011 14:29:46 +0000 (15:29 +0100)]
Add a dummy option -i to ffplay so that it is easy to switch between ffmpeg -i "file" and ffplay -i "file".

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoframebuffer device demuxer
Stefano Sabatini [Mon, 7 Mar 2011 17:54:52 +0000 (18:54 +0100)]
framebuffer device demuxer

9 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: Michael Niedermayer <michaelni@gmx.at>
9 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>
(cherry picked from commit 6a7e074eb98c4d45898d7f2920312db6899ee650)

9 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>
(cherry picked from commit 688c22e033a48ebf84fb4b52642bbd40f11e9c4e)

9 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>
(cherry picked from commit 789936dbbda60990220b80769ed75702775ea0b2)

9 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>
(cherry picked from commit 435cebd01560691e9322bdb0aa5af5b2bc76c3f8)

9 years agoreindent.
Ronald S. Bultje [Mon, 7 Mar 2011 18:18:57 +0000 (13:18 -0500)]
reindent.
(cherry picked from commit 4e84f994d3c17f6786fbd4f6463a168fbaaaf477)

9 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>
(cherry picked from commit f1ef2cd9ed22be231bb4da8d2f93d9a0c7877aa7)

9 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>
(cherry picked from commit e8bb2e24398ec838d9e49cf115b7e132609a9fb7)

9 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>
(cherry picked from commit 2790d7a9ffbd51f33e5367a31ace5c44c30401a1)

9 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>
(cherry picked from commit c92562467e8900fc727d03499afb571a9363c20c)

9 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>
(cherry picked from commit 36864ac3540445c513484017aa9927e942fac24a)

9 years agoac3enc: add some assertions
Justin Ruggles [Fri, 4 Mar 2011 17:12:01 +0000 (12:12 -0500)]
ac3enc: add some assertions
(cherry picked from commit 2d9a101a1f5e102d9538de827d9e4a2e8cf17c89)

9 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.
(cherry picked from commit 7100d63ca5edfc2e11c68201fb70d61a08a020cb)

9 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.
(cherry picked from commit d21be5f15bec15933cb6360aa0159961d987f449)

9 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>
(cherry picked from commit d34ca1cfe3182c1cb185c31e6b1bb64f40de0e92)

9 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>
(cherry picked from commit 76aa876e69cf78a40821e66dec0a1006e4eb23ec)

9 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>
(cherry picked from commit e51975392d85e72801193123945a35fb5221248f)

9 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>
(cherry picked from commit 655e45e7dfafc494044cc52f8889fc6da75eff6a)

9 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>
(cherry picked from commit 02dd3666c2944a3db44ba13916ba40dbdd41f9b1)

9 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>
(cherry picked from commit f4f4e12c0d4e86c4900481b7dca94d22e733c14a)

9 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>
(cherry picked from commit 8f73c060773156cbf48e153506a38bcb6e2c4c6d)

9 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>
(cherry picked from commit f3bea9915fdc87c3f5b635fcfe0250a28e2b1a88)

9 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>
9 years agoDo not loop endlessly if id3v2 tag size is negative / too large.
Carl Eugen Hoyos [Mon, 7 Mar 2011 22:18:36 +0000 (23:18 +0100)]
Do not loop endlessly if id3v2 tag size is negative / too large.

Fixes the sample from issue 2649.

9 years agoChange filesize to int64_t.
Carl Eugen Hoyos [Mon, 7 Mar 2011 22:15:32 +0000 (23:15 +0100)]
Change filesize to int64_t.

9 years agoSeek back to old position after reading id3v1 tag.
Carl Eugen Hoyos [Mon, 7 Mar 2011 09:24:37 +0000 (10:24 +0100)]
Seek back to old position after reading id3v1 tag.

FFmpeg did not seek back to the original position, but to "0", making
reading a VBR tag impossible.
(issue 2645)

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