ffmpeg.git
9 years agoRevert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION"
Michael Niedermayer [Thu, 17 Mar 2011 16:01:10 +0000 (17:01 +0100)]
Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION"

This reverts commit 29ba091136a5e04574f7bfc1b17536c923958f6f.

9 years agoRevert "use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*"
Michael Niedermayer [Thu, 17 Mar 2011 15:57:37 +0000 (16:57 +0100)]
Revert "use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*"

This reverts commit a03be6e1ba4cbf9984b0bbdb674704bbb2da6713.

9 years agoRevert "replace FFmpeg with Libav in doc/"
Michael Niedermayer [Thu, 17 Mar 2011 15:55:58 +0000 (16:55 +0100)]
Revert "replace FFmpeg with Libav in doc/"

This reverts commit f8a45fa1b1764b34d4263eacd93411e8ba0484a4.

Conflicts:

doc/optimization.txt

9 years agoMerge remote-tracking branch 'newdev/master'
Michael Niedermayer [Thu, 17 Mar 2011 15:53:58 +0000 (16:53 +0100)]
Merge remote-tracking branch 'newdev/master'

Conflicts:
Changelog
doc/APIchanges
doc/optimization.txt
libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoAdd PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
Peter Ross [Thu, 17 Mar 2011 10:15:57 +0000 (21:15 +1100)]
Add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoCrystalHD: Use doxygen compatible comments where relevant.
Philip Langdale [Tue, 15 Mar 2011 05:14:23 +0000 (22:14 -0700)]
CrystalHD: Use doxygen compatible comments where relevant.

Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf: Make make_absolute_url a lavf internal function
Martin Storsjö [Thu, 17 Mar 2011 10:24:23 +0000 (12:24 +0200)]
lavf: Make make_absolute_url a lavf internal function

This is shared by both applehttp demuxer and protocol.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agoAdd missed APIchanges and changelog entries
Martin Storsjö [Thu, 17 Mar 2011 10:23:52 +0000 (12:23 +0200)]
Add missed APIchanges and changelog entries

Add an APIchanges entry for the av_pkt_dump2 and av_pkt_dump_log2
functions, and a changelog entry for the apple http live streaming
protocol handler.

Since neither of them got a minor bump at commit time, but were
applied before the jv demuxer, they all can be considered added
in this minor version.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agoapplehttp: Fix a typo in a comment
Martin Storsjö [Thu, 17 Mar 2011 10:24:08 +0000 (10:24 +0000)]
applehttp: Fix a typo in a comment

Signed-off-by: Mans Rullgard <mans@mansr.com>
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>
(cherry picked from commit c5dcb3d493a6bb73efeb8bfae24f5cc31908201f)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
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>
(cherry picked from commit d541c8b468c12892fe7b7e655e1ed45e11e2166d)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
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>
(cherry picked from commit 77f21ce4641b53f3277ba30ca3d009b6250fd9ea)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
9 years agoaacenc: cosmetics, indentation, and comment clarification
Nathan Caldwell [Thu, 17 Mar 2011 03:35:39 +0000 (23:35 -0400)]
aacenc: cosmetics, indentation, and comment clarification

Correct bad indentation in aaccoder
Clarify and correct comments in 3GPP psymodel, other cosmetics.

9 years agoaacenc: Refactor the parts of the AAC psymodel.
Nathan Caldwell [Thu, 17 Mar 2011 03:34:12 +0000 (23:34 -0400)]
aacenc: Refactor the parts of the AAC psymodel.

3GPP:
Remove ffac from and move min_snr out of AacPsyBand.
Rearrange AacPsyCoeffs to make it easier to implement energy spreading.
Rename the band[] array to bands[]
Copy energies and thresholds at the end of analysis.

LAME:
Use a loop instead of an if chain in LAME windowing.

9 years agoaaccoder: Change FFMAX for allzero flag to OR bit operation
Young Han Lee [Fri, 11 Mar 2011 02:39:24 +0000 (11:39 +0900)]
aaccoder: Change FFMAX for allzero flag to OR bit operation

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoavio: rename put_flush_packet -> avio_flush
Anton Khirnov [Mon, 14 Mar 2011 19:39:06 +0000 (20:39 +0100)]
avio: rename put_flush_packet -> avio_flush

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoavio: deprecate url_close_buf
Anton Khirnov [Mon, 14 Mar 2011 19:39:05 +0000 (20:39 +0100)]
avio: deprecate url_close_buf

It's not used anywhere and its return value looks broken.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoavio: deprecate url_open_buf
Anton Khirnov [Mon, 14 Mar 2011 19:39:04 +0000 (20:39 +0100)]
avio: deprecate url_open_buf

It's only used in one place and does the same thing as
avio_alloc_context.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoavio: always compile avio_printf, rather than on CONFIG_MUXERS
Anton Khirnov [Mon, 14 Mar 2011 19:39:03 +0000 (20:39 +0100)]
avio: always compile avio_printf, rather than on CONFIG_MUXERS

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoavio: avio_ prefix for url_fprintf
Anton Khirnov [Mon, 14 Mar 2011 19:39:02 +0000 (20:39 +0100)]
avio: avio_ prefix for url_fprintf

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoavio: change avio_tell/skip from macros to inline functions
Anton Khirnov [Mon, 14 Mar 2011 19:39:01 +0000 (20:39 +0100)]
avio: change avio_tell/skip from macros to inline functions

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoavio: make url_setbufsize internal.
Anton Khirnov [Mon, 14 Mar 2011 19:38:58 +0000 (20:38 +0100)]
avio: make url_setbufsize internal.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agolavf: move ff_get_v from avio.h to avio_internal.h
Anton Khirnov [Mon, 14 Mar 2011 19:38:57 +0000 (20:38 +0100)]
lavf: move ff_get_v from avio.h to avio_internal.h

And rename it to ffio_read_varlen.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agonutenc: mux chapters.
Anton Khirnov [Wed, 16 Mar 2011 05:42:43 +0000 (06:42 +0100)]
nutenc: mux chapters.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agodoc: update applehttp documentation
Luca Barbato [Sun, 13 Mar 2011 18:50:37 +0000 (19:50 +0100)]
doc: update applehttp documentation

Integrate more comments from Stefano.

9 years agolavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense
Anton Khirnov [Tue, 15 Mar 2011 08:14:38 +0000 (09:14 +0100)]
lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
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 agoRemove occurrences of my old email address
Ramiro Polla [Wed, 16 Mar 2011 18:28:43 +0000 (15:28 -0300)]
Remove occurrences of my old email address

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agodsputil: add bswap16_buf()
Mans Rullgard [Tue, 20 Apr 2010 23:09:00 +0000 (00:09 +0100)]
dsputil: add bswap16_buf()

There are several places where a buffer is byte-swapped in 16-bit units.
This allows them to share code which can be optimised for various
architectures.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agodarwin: use -read_only_relocs flag only on 32-bit x86
Sean McGovern [Wed, 16 Mar 2011 01:01:17 +0000 (01:01 +0000)]
darwin: use -read_only_relocs flag only on 32-bit x86

Avoids the linker warning:
ld: warning: -read_only_relocs cannot be used with x86_64

Signed-off-by: Mans Rullgard <mans@mansr.com>
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 agoreplace FFmpeg with Libav in doc/
Janne Grunau [Mon, 14 Mar 2011 21:59:19 +0000 (22:59 +0100)]
replace FFmpeg with Libav in doc/

unless it stands for ffmpeg the program or is historic

9 years agouse LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*
Janne Grunau [Mon, 14 Mar 2011 21:27:40 +0000 (22:27 +0100)]
use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*

9 years agoreplace FFMPEG with LIBAV in FFMPEG_CONFIGURATION
Janne Grunau [Mon, 14 Mar 2011 21:23:10 +0000 (22:23 +0100)]
replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION

also update the multiple inclusion guards in config.h|mak

9 years agopartially rename FFmpeg to Libav
Janne Grunau [Mon, 14 Mar 2011 20:39:58 +0000 (21:39 +0100)]
partially rename FFmpeg to Libav

update mailing list references and irc channels in configure

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 agomp3enc: remove mp3_write_packet(), use ff_raw_write_packet() instead
Anton Khirnov [Wed, 16 Mar 2011 13:31:32 +0000 (14:31 +0100)]
mp3enc: remove mp3_write_packet(), use ff_raw_write_packet() instead

The two functions are identical, no point in duplicating code here.

9 years agoDo not attempt to decode APE file with no frames
Kostya [Tue, 15 Mar 2011 09:19:43 +0000 (09:19 +0000)]
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 agojvdec: don't use deprecated url_feof()
Anton Khirnov [Wed, 16 Mar 2011 04:46:22 +0000 (04:46 +0000)]
jvdec: don't use deprecated url_feof()

9 years agomathops: fix MULL() when the compiler does not inline the function.
Justin Ruggles [Wed, 16 Mar 2011 00:38:23 +0000 (20:38 -0400)]
mathops: fix MULL() when the compiler does not inline the function.

If the function is not inlined, an immmediate cannot be used for the
shift parameter, so the %cl register must be used instead in that case.

This fixes compilation for x86-32 using gcc with --disable-optimizations.

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 agoid3v2: merge TYER/TDAT/TIME to date tag
Anton Khirnov [Tue, 15 Mar 2011 09:14:16 +0000 (10:14 +0100)]
id3v2: merge TYER/TDAT/TIME to date tag

9 years agomathops: change "g" constraint to "rm" in x86-32 version of MUL64().
Justin Ruggles [Tue, 15 Mar 2011 17:35:05 +0000 (13:35 -0400)]
mathops: change "g" constraint to "rm" in x86-32 version of MUL64().

The 1-arg imul instruction cannot take an immediate argument, only a register
or memory argument.

9 years agomathops: convert MULL/MULH/MUL64 to inline functions rather than macros.
Justin Ruggles [Tue, 15 Mar 2011 17:30:24 +0000 (13:30 -0400)]
mathops: convert MULL/MULH/MUL64 to inline functions rather than macros.

This fixes unexpected name collisions that were occurring with variables
declared within the macros.
It also fixes the fate-acodec-ac3_fixed regression test on x86-32.

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>