10 years agoAllow mono encoding with LAME.
Thierry Foucu [Tue, 2 Nov 2010 20:29:20 +0000 (20:29 +0000)]
Allow mono encoding with LAME.

Patch by Thierry Foucu, tfoucu gmail

Originally committed as revision 25650 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFix timestamp handling in more filters after the change which set the
Stefano Sabatini [Tue, 2 Nov 2010 19:42:08 +0000 (19:42 +0000)]
Fix timestamp handling in more filters after the change which set the
timebase in the filter link.

Originally committed as revision 25649 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoMake the blackframe filter print the time, in addition to the
Stefano Sabatini [Tue, 2 Nov 2010 19:42:05 +0000 (19:42 +0000)]
Make the blackframe filter print the time, in addition to the
timestamp, for each detected black frame.

Originally committed as revision 25648 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoMake the cropdetect filter print the time for each frame, in addition
Stefano Sabatini [Tue, 2 Nov 2010 19:42:03 +0000 (19:42 +0000)]
Make the cropdetect filter print the time for each frame, in addition
to the timestamp.

Originally committed as revision 25647 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFix timestamp computation when the timebase changes during filtering.
Stefano Sabatini [Tue, 2 Nov 2010 18:40:59 +0000 (18:40 +0000)]
Fix timestamp computation when the timebase changes during filtering.

The timestamps for all the buffered frames are scaled against
AV_TIME_BASE_Q, and need to be scaled back to AV_TIME_BASE_Q when they
are extracted from the filterchain.

Originally committed as revision 25646 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFix crop->var_values[VAR_T] computation in the crop filter.
Stefano Sabatini [Tue, 2 Nov 2010 18:40:55 +0000 (18:40 +0000)]
Fix crop->var_values[VAR_T] computation in the crop filter.

Originally committed as revision 25645 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoaacdec: change type of data in decode_audio_specific_config parameters
Janne Grunau [Tue, 2 Nov 2010 08:33:10 +0000 (08:33 +0000)]
aacdec: change type of data in decode_audio_specific_config parameters

AVCodecContext.extradata is uint8_t*, silence a warning

Originally committed as revision 25644 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agompegts: support LATM syntax
Janne Grunau [Tue, 2 Nov 2010 08:32:33 +0000 (08:32 +0000)]
mpegts: support LATM syntax

Originally committed as revision 25643 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoAdd single stream LATM/LOAS decoder
Janne Grunau [Tue, 2 Nov 2010 08:32:04 +0000 (08:32 +0000)]
Add single stream LATM/LOAS decoder

The decoder is just a wrapper around the AAC decoder.
based on patch by Paul Kendall { paul <ät> kcbbs gen nz }

Originally committed as revision 25642 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoaacdec: pass avctx as logging context for decode_audio_specific_config
Janne Grunau [Tue, 2 Nov 2010 08:30:31 +0000 (08:30 +0000)]
aacdec: pass avctx as logging context for decode_audio_specific_config

Use avctx in all called functions. This allows passing a NULL AACContext
for LATM since the AACContext is only used in output_configure() which
is skipped for LATM parsing.

Originally committed as revision 25641 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoaacdec: refactor the actual aac decoding code into its own function
Janne Grunau [Tue, 2 Nov 2010 08:29:43 +0000 (08:29 +0000)]
aacdec: refactor the actual aac decoding code into its own function

aac_decode_frame() remains as AVPacket handling a wrapper. The actual
decoding function takes a GetBitContext as input and will be used be the
AAC LATM decoder to avoid copying the unaligned AAC bitstream.

Originally committed as revision 25640 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoaacdec: return consumed bits in decode_audio_specific_config
Janne Grunau [Tue, 2 Nov 2010 08:28:55 +0000 (08:28 +0000)]
aacdec: return consumed bits in decode_audio_specific_config

Originally committed as revision 25639 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoaacdec: add MPEG4AudioConfig as parameter for decode_audio_specific_config
Janne Grunau [Tue, 2 Nov 2010 08:28:28 +0000 (08:28 +0000)]
aacdec: add MPEG4AudioConfig as parameter for decode_audio_specific_config

This will be used by the latm decoder to avoid AACContext changes during
audio specific config parsing.

Originally committed as revision 25638 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoffmpeg.c: reindent
Anton Khirnov [Tue, 2 Nov 2010 06:12:56 +0000 (06:12 +0000)]
ffmpeg.c: reindent

Originally committed as revision 25637 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoffmpeg.c: don't autocopy stream/chapter metadata if manual mapping is specified
Anton Khirnov [Tue, 2 Nov 2010 06:12:54 +0000 (06:12 +0000)]
ffmpeg.c: don't autocopy stream/chapter metadata if manual mapping is specified

Originally committed as revision 25636 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoffmpeg.c: extend map_meta_data to allow advanced mappings
Anton Khirnov [Tue, 2 Nov 2010 06:01:28 +0000 (06:01 +0000)]
ffmpeg.c: extend map_meta_data to allow advanced mappings

i.e. to/from streams/chapters/programs.

Originally committed as revision 25635 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agodnxhd_mmx: prefer xmm registers below xmm6 when they are available
Ramiro Polla [Tue, 2 Nov 2010 03:09:16 +0000 (03:09 +0000)]
dnxhd_mmx: prefer xmm registers below xmm6 when they are available

Originally committed as revision 25634 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFix possibly exploitable out of buffer writes in msrle_decode_pal4().
Michael Niedermayer [Tue, 2 Nov 2010 01:19:15 +0000 (01:19 +0000)]
Fix possibly exploitable out of buffer writes in msrle_decode_pal4().
This fix is minimalistic, that function should be cleaned up by someone.

Originally committed as revision 25633 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFix possibly exploitable buffer overrun in msrle_decode_8_16_24_32().
Michael Niedermayer [Tue, 2 Nov 2010 01:19:12 +0000 (01:19 +0000)]
Fix possibly exploitable buffer overrun in msrle_decode_8_16_24_32().
Issue has been reported to me by Gynvael Coldwind

Originally committed as revision 25632 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoremove impossible condition from msrle_decode_pal4()
Michael Niedermayer [Tue, 2 Nov 2010 01:19:09 +0000 (01:19 +0000)]
remove impossible condition from msrle_decode_pal4()

Originally committed as revision 25631 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agofix indent
Michael Niedermayer [Tue, 2 Nov 2010 01:19:03 +0000 (01:19 +0000)]
fix indent

Originally committed as revision 25630 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoRemove ffmpeg PGMYUV compatibility hack, which was deprecated since
Stefano Sabatini [Tue, 2 Nov 2010 00:29:13 +0000 (00:29 +0000)]
Remove ffmpeg PGMYUV compatibility hack, which was deprecated since

The user is requested to specify "-f image2" in place of "-f pgmyuv"
for reading/writing PGMYUV files, as for the other image formats.

Originally committed as revision 25629 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agodsputil: Use explicit movzbl instead of movzx
İsmail Dönmez [Mon, 1 Nov 2010 19:35:51 +0000 (19:35 +0000)]
dsputil: Use explicit movzbl instead of movzx

This fixes compilation with the latest clang trunk version.

Patch by İsmail Dönmez, ismail at namtrac dot org

Originally committed as revision 25628 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFix documented syntax for the cropdetect filter.
Stefano Sabatini [Mon, 1 Nov 2010 10:33:10 +0000 (10:33 +0000)]
Fix documented syntax for the cropdetect filter.

Originally committed as revision 25627 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoMake strmatch() return 1 only if the string compared against the
Stefano Sabatini [Mon, 1 Nov 2010 09:34:21 +0000 (09:34 +0000)]
Make strmatch() return 1 only if the string compared against the
prefix does not contain other characters which may belong to an

This allows to distinguish for example to have different constants
with the same prefix (e.g. "foo" and "foobar").

Originally committed as revision 25626 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoAdd st, ld, while examples/tests.
Stefano Sabatini [Mon, 1 Nov 2010 09:34:18 +0000 (09:34 +0000)]
Add st, ld, while examples/tests.

Originally committed as revision 25625 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoAdd examples of unary operators.
Stefano Sabatini [Mon, 1 Nov 2010 09:34:15 +0000 (09:34 +0000)]
Add examples of unary operators.

Originally committed as revision 25624 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFix evaluation of expressions of the form: E1;E2.
Stefano Sabatini [Mon, 1 Nov 2010 09:34:12 +0000 (09:34 +0000)]
Fix evaluation of expressions of the form: E1;E2.

The pointer to the char ';' has to be increased before to evaluate

Originally committed as revision 25623 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoaacenc: Correct spreading calculation for high spreading.
Nathan Caldwell [Mon, 1 Nov 2010 07:45:13 +0000 (07:45 +0000)]
aacenc: Correct spreading calculation for high spreading.

The 3GPP spec uses the following calculation for high spreading:

thr'_spr = max(thr_scaled, s_h(n) * thr_scaled(n-1))

where, n is defined as the current band, and s_h() is defined as "[...] the
distance of adjacent bands in Bark and a constant slope that is 15 dB/Bark
[...]". This is a little ambiguous as you would assume you want the Bark
width of the previous band for this calculation. However, this assumption
appears to be incorrect, and you really want the Bark width of the current
band. Coincidentally this is exactly what the spec calls for! =P

This noticeably improves Tom's Diner at low bitrates (I tested at 64kbps,
with mid/side disabled).

Patch by: Nathan Caldwell <saintdev@gmail.com>

Originally committed as revision 25622 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoaacenc: cosmetics: Swap spreading_hi/low name to match the 3GPP spec.
Nathan Caldwell [Mon, 1 Nov 2010 07:39:31 +0000 (07:39 +0000)]
aacenc: cosmetics: Swap spreading_hi/low name to match the 3GPP spec.

Patch by: Nathan Caldwell <saintdev@gmail.com>

Originally committed as revision 25621 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agolpc_mmx: add xmm registers to clobber list
Ramiro Polla [Sun, 31 Oct 2010 23:37:15 +0000 (23:37 +0000)]
lpc_mmx: add xmm registers to clobber list

Originally committed as revision 25620 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agolpc_mmx: merge some asm blocks
Ramiro Polla [Sun, 31 Oct 2010 23:36:26 +0000 (23:36 +0000)]
lpc_mmx: merge some asm blocks

These blocks depended on the compiler keeping xmm registers untouched between

Originally committed as revision 25619 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoUse AV_RL32() in opt_codec_tag().
Stefano Sabatini [Sun, 31 Oct 2010 22:48:44 +0000 (22:48 +0000)]
Use AV_RL32() in opt_codec_tag().

Originally committed as revision 25618 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agosad16_sse2: merge 2 asm blocks
Ramiro Polla [Sun, 31 Oct 2010 21:20:20 +0000 (21:20 +0000)]
sad16_sse2: merge 2 asm blocks

Originally committed as revision 25617 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoffmpeg: fix opt_codec_tag() return value
Ramiro Polla [Sun, 31 Oct 2010 19:55:13 +0000 (19:55 +0000)]
ffmpeg: fix opt_codec_tag() return value

opt_codec_tag() is now used under OPT_FUNC2, which must return a value.

Originally committed as revision 25616 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoxmm_clobbers: list xmm registers first in clobber list
Ramiro Polla [Sun, 31 Oct 2010 18:14:48 +0000 (18:14 +0000)]
xmm_clobbers: list xmm registers first in clobber list

suncc does not like the leading commas inside the macro, but it has no problem
with trailing commas.

Originally committed as revision 25615 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoidct_sse2_xvid: only mark xmm>=8 as clobbered on x86_64
Ramiro Polla [Sun, 31 Oct 2010 16:28:28 +0000 (16:28 +0000)]
idct_sse2_xvid: only mark xmm>=8 as clobbered on x86_64

Originally committed as revision 25614 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoDocument url_write().
Stefano Sabatini [Sun, 31 Oct 2010 16:11:56 +0000 (16:11 +0000)]
Document url_write().

Originally committed as revision 25613 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agomotion_est_mmx: prefer xmm registers below xmm6 when they are available
Ramiro Polla [Sun, 31 Oct 2010 15:07:21 +0000 (15:07 +0000)]
motion_est_mmx: prefer xmm registers below xmm6 when they are available

Originally committed as revision 25612 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agodsputil_mmx: add xmm registers to clobber list
Ramiro Polla [Sun, 31 Oct 2010 13:57:58 +0000 (13:57 +0000)]
dsputil_mmx: add xmm registers to clobber list

Originally committed as revision 25611 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agocosmetics: split long line
Ramiro Polla [Sun, 31 Oct 2010 13:46:17 +0000 (13:46 +0000)]
cosmetics: split long line

Originally committed as revision 25610 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agofdct_mmx: add xmm registers to clobber list
Ramiro Polla [Sun, 31 Oct 2010 13:45:04 +0000 (13:45 +0000)]
fdct_mmx: add xmm registers to clobber list

Originally committed as revision 25609 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoidct_sse2_xvid: add xmm registers to clobber list
Ramiro Polla [Sun, 31 Oct 2010 13:17:43 +0000 (13:17 +0000)]
idct_sse2_xvid: add xmm registers to clobber list

Originally committed as revision 25608 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agompegvideo_mmx: add xmm registers to clobber list
Ramiro Polla [Sun, 31 Oct 2010 13:15:16 +0000 (13:15 +0000)]
mpegvideo_mmx: add xmm registers to clobber list

Originally committed as revision 25607 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agodsputil_mmx: prefer xmm registers below xmm6 when they are available
Ramiro Polla [Sun, 31 Oct 2010 13:13:53 +0000 (13:13 +0000)]
dsputil_mmx: prefer xmm registers below xmm6 when they are available

Originally committed as revision 25606 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agobink: make bink_rlelens static (it's only used in this file)
Ramiro Polla [Sat, 30 Oct 2010 19:51:46 +0000 (19:51 +0000)]
bink: make bink_rlelens static (it's only used in this file)

Originally committed as revision 25605 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoh264dsp: add xmm registers to clobber list
Ramiro Polla [Sat, 30 Oct 2010 17:14:22 +0000 (17:14 +0000)]
h264dsp: add xmm registers to clobber list

Originally committed as revision 25604 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFix ffserver-related regression (and crash) introduced in r25500.
Rocky Cardwell [Fri, 29 Oct 2010 14:54:18 +0000 (14:54 +0000)]
Fix ffserver-related regression (and crash) introduced in r25500.
Fixes issue 2317.

Patch by Rocky Cardwell, rocky d cardwell a lifespringschool d org

Originally committed as revision 25603 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoMove new_output_stream() up for upcoming fix for issue 2317.
Carl Eugen Hoyos [Fri, 29 Oct 2010 14:48:38 +0000 (14:48 +0000)]
Move new_output_stream() up for upcoming fix for issue 2317.

Originally committed as revision 25602 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoStore src/dstFormat after calling handle_jpeg
Martin Storsjö [Fri, 29 Oct 2010 13:48:12 +0000 (13:48 +0000)]
Store src/dstFormat after calling handle_jpeg

handle_jpeg may update the src/dstFormat variables, this makes sure the
updated version is stored in the context.

This fixes roundup issue 2302.

Patch by Troot, all_crap_goes_here at hotmail

Originally committed as revision 32562 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

10 years agortsp: Split out the RTSP demuxer functions to a separate, new file
Martin Storsjö [Fri, 29 Oct 2010 08:43:57 +0000 (08:43 +0000)]
rtsp: Split out the RTSP demuxer functions to a separate, new file

Originally committed as revision 25601 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agortsp: Move rtsp_setup_output_streams into rtspenc.c
Martin Storsjö [Fri, 29 Oct 2010 08:41:49 +0000 (08:41 +0000)]
rtsp: Move rtsp_setup_output_streams into rtspenc.c

Originally committed as revision 25600 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoffmpeg.c: dynamically allocate metadata maps
Anton Khirnov [Thu, 28 Oct 2010 20:28:22 +0000 (20:28 +0000)]
ffmpeg.c: dynamically allocate metadata maps

Originally committed as revision 25599 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoindent
Ramiro Polla [Thu, 28 Oct 2010 18:31:30 +0000 (18:31 +0000)]

Originally committed as revision 25598 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoh264dsp: merge some more asm blocks
Ramiro Polla [Thu, 28 Oct 2010 18:22:21 +0000 (18:22 +0000)]
h264dsp: merge some more asm blocks

Originally committed as revision 25597 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFactorize: opt_{audio,video,subtitle}_tag() -> opt_codec_tag().
Stefano Sabatini [Thu, 28 Oct 2010 13:20:26 +0000 (13:20 +0000)]
Factorize: opt_{audio,video,subtitle}_tag() -> opt_codec_tag().

Originally committed as revision 25596 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFix 10l leak in ffv1.
Michael Niedermayer [Thu, 28 Oct 2010 12:15:50 +0000 (12:15 +0000)]
Fix 10l leak in ffv1.

Originally committed as revision 25595 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoTry to find a bit better initial states in ffv1 2pass.
Michael Niedermayer [Thu, 28 Oct 2010 12:15:47 +0000 (12:15 +0000)]
Try to find a bit better initial states in ffv1 2pass.
Difference in filesizes to foreman ffv1 version=2, context=1 coder=1
18637016 adv-pass2-g300.avi
18638806 adv-pass1-g300.avi
18640534 ref-pass2-g300.avi
18918214 adv-pass2-g1.avi
18982048 ref-pass2-g1.avi
21516230 adv-pass1-g1.avi

Originally committed as revision 25594 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoKeep track of how many slices*gops where encoded in ffv1 2 pass.
Michael Niedermayer [Thu, 28 Oct 2010 12:15:44 +0000 (12:15 +0000)]
Keep track of how many slices*gops where encoded in ffv1 2 pass.

Originally committed as revision 25593 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agofactorize variable declaration in ffv1.
Michael Niedermayer [Thu, 28 Oct 2010 12:15:40 +0000 (12:15 +0000)]
factorize variable declaration in ffv1.

Originally committed as revision 25592 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFix crashes in vorbis decoding found by zzuf
Jason Garrett-Glaser [Wed, 27 Oct 2010 16:30:01 +0000 (16:30 +0000)]
Fix crashes in vorbis decoding found by zzuf
Fixes issue 2322.

Originally committed as revision 25591 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoffmpeg.c manual: clarify map_meta_data usage.
Anton Khirnov [Wed, 27 Oct 2010 10:24:14 +0000 (10:24 +0000)]
ffmpeg.c manual: clarify map_meta_data usage.

Originally committed as revision 25590 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoaacenc: Remove energy 'normalization' modification from the 3GPP psymodel
Nathan Caldwell [Wed, 27 Oct 2010 06:36:47 +0000 (06:36 +0000)]
aacenc: Remove energy 'normalization' modification from the 3GPP psymodel

This greatly improves bitrate handling. You will now get within a few
kbps of your requested bitrate instead of 20-40kbps higher.

There is absolutely no analog to this line in the 3GPP spec, that I
can find.

patch by Nathan Caldwell saintdev (at) gmail

Originally committed as revision 25589 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoaacenc: Fix threshold-in-quiet calculation in the 3GPP psymodel.
Nathan Caldwell [Wed, 27 Oct 2010 05:54:44 +0000 (05:54 +0000)]
aacenc: Fix threshold-in-quiet calculation in the 3GPP psymodel.

Removing the modification vastly improves quality (at a slight bitrate
cost) for some samples. castanets.wav is a good example. The closest
equivalent I see to the modification in the 3GPP spec is a similar
modification (over a specific frequency range) when TNS is used.

This also changes the threshold-in-quiet calculation to match the
3GPP spec.

patch by Nathan Caldwell saintdev (at) gmail

Originally committed as revision 25588 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoaacenc: Fix the conditions under which 3GPP pre-echo control is run.
Nathan Caldwell [Wed, 27 Oct 2010 05:54:41 +0000 (05:54 +0000)]
aacenc: Fix the conditions under which 3GPP pre-echo control is run.

According to the 3GPP spec:
"Thus the pre-echo control is inactive for the first short window (but
not all short windows in a short frame) after a start block and for
all frames with a stop window sequence."

Currently, pre-echo control is only run when the current frame is not
a short frame, and the previous frame is not a short frame.

patch by Nathan Caldwell saintdev (at) gmail

Originally committed as revision 25587 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agovorbiscomment: convert metadata before computing the header's length
Anton Khirnov [Wed, 27 Oct 2010 05:02:29 +0000 (05:02 +0000)]
vorbiscomment: convert metadata before computing the header's length

Originally committed as revision 25586 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agortsp: Add stub declarations of the setup_in/output_streams functions
Martin Storsjö [Wed, 27 Oct 2010 00:42:35 +0000 (00:42 +0000)]
rtsp: Add stub declarations of the setup_in/output_streams functions

This may be needed to avoid calls to implicitly defined functions
(that will be removed by dead code elimination later anyway).

Originally committed as revision 25585 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFFV1 initial state 2pass code.
Michael Niedermayer [Tue, 26 Oct 2010 23:01:17 +0000 (23:01 +0000)]
FFV1 initial state 2pass code.

Originally committed as revision 25584 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoRead & write initial_states for ffv1
Michael Niedermayer [Tue, 26 Oct 2010 23:01:14 +0000 (23:01 +0000)]
Read & write initial_states for ffv1

Originally committed as revision 25583 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoAdd initial_states array to ffv1.
Michael Niedermayer [Tue, 26 Oct 2010 23:01:11 +0000 (23:01 +0000)]
Add initial_states array to ffv1.

Originally committed as revision 25582 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoAdd rc_stat2 to ffv1 this will be needed for finding good initial contexts in 2 pass...
Michael Niedermayer [Tue, 26 Oct 2010 23:01:07 +0000 (23:01 +0000)]
Add rc_stat2 to ffv1 this will be needed for finding good initial contexts in 2 pass mode.

Originally committed as revision 25581 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoOptimize state initialization in ffv1 clear_state().
Michael Niedermayer [Tue, 26 Oct 2010 23:01:04 +0000 (23:01 +0000)]
Optimize state initialization in ffv1 clear_state().

Originally committed as revision 25580 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoOnly allocate stats_out when needed in ffv1
Michael Niedermayer [Tue, 26 Oct 2010 23:01:00 +0000 (23:01 +0000)]
Only allocate stats_out when needed in ffv1

Originally committed as revision 25579 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFactorize litteral constents in ffv1 into STATS_OUT_SIZE.
Michael Niedermayer [Tue, 26 Oct 2010 23:00:57 +0000 (23:00 +0000)]
Factorize litteral constents in ffv1 into STATS_OUT_SIZE.

Originally committed as revision 25578 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoMake 1pass statistic collection in ffv1 put_symbol_inline() conditional to avoid...
Michael Niedermayer [Tue, 26 Oct 2010 23:00:49 +0000 (23:00 +0000)]
Make 1pass statistic collection in ffv1 put_symbol_inline() conditional to avoid slowdown when more statistic collection code is added.

Originally committed as revision 25577 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoBump required x264 version to X264_BUILD 99
Jason Garrett-Glaser [Tue, 26 Oct 2010 18:19:22 +0000 (18:19 +0000)]
Bump required x264 version to X264_BUILD 99
Required after r25567.

Originally committed as revision 25576 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoRemove dead code in theora_decode_tables
Jason Garrett-Glaser [Tue, 26 Oct 2010 07:37:51 +0000 (07:37 +0000)]
Remove dead code in theora_decode_tables
Reading 7 bits as an unsigned int can't result in a value exceeding 127.
Accordingly, remove error message (as it'll never be reached).

Originally committed as revision 25575 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoReindent after r25573
Jason Garrett-Glaser [Tue, 26 Oct 2010 07:30:01 +0000 (07:30 +0000)]
Reindent after r25573

Originally committed as revision 25574 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFix Theora decoding bug if loopfilter is completely disabled
Jason Garrett-Glaser [Tue, 26 Oct 2010 07:29:00 +0000 (07:29 +0000)]
Fix Theora decoding bug if loopfilter is completely disabled
Bug caused by the fact that get_bits(gb, 0) is undefined.
Doesn't affect any streams generated by the official Theora encoder, but such
streams are nevertheless valid.

Fixes decoding of CELT-933dd833-nmr-bandt.ogv.

Originally committed as revision 25573 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoClean up ALACdec
Jason Garrett-Glaser [Tue, 26 Oct 2010 07:20:51 +0000 (07:20 +0000)]
Clean up ALACdec
Do decode init in the init function instead of at the first frame.
Fix some possible crash cases.

Originally committed as revision 25572 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoIncrease ffv1 encoding speed from 65 to 80 fps by forcing some inlining.
Michael Niedermayer [Tue, 26 Oct 2010 01:59:14 +0000 (01:59 +0000)]
Increase ffv1 encoding speed from 65 to 80 fps by forcing some inlining.

Originally committed as revision 25571 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoAdd quant_table_index to ffv1 PlaneContext and use it instead of duplicating the...
Michael Niedermayer [Tue, 26 Oct 2010 01:59:03 +0000 (01:59 +0000)]
Add quant_table_index to ffv1 PlaneContext and use it instead of duplicating the currents implementation of calculating it.

Originally committed as revision 25570 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agodct32: mark xmm registers in clobber list in ff_dct32_float_sse()
Ramiro Polla [Mon, 25 Oct 2010 20:29:29 +0000 (20:29 +0000)]
dct32: mark xmm registers in clobber list in ff_dct32_float_sse()

Originally committed as revision 25569 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoh264dsp: merge some asm blocks
Ramiro Polla [Mon, 25 Oct 2010 18:02:02 +0000 (18:02 +0000)]
h264dsp: merge some asm blocks

Some code was initializing some xmm registers in one asm block and using them
in the following block, assuming they wouldn't be changed in between blocks.

Originally committed as revision 25568 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoMake libx264 take the pict_type input parameter into account,
Nicolas George [Mon, 25 Oct 2010 14:40:00 +0000 (14:40 +0000)]
Make libx264 take the pict_type input parameter into account,
thus making forced key frames work.

Patch by Nicolas George, nicolas d george a normalesup d org

Originally committed as revision 25567 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoaacenc: Fix bug in LAME windowing where only one channel got initalized
Nathan Caldwell [Mon, 25 Oct 2010 06:15:21 +0000 (06:15 +0000)]
aacenc: Fix bug in LAME windowing where only one channel got initalized

I used the same loop counter for the inner and outer initalization loops.
This caused initalization to only run for the first channel. This in turn lead
to any channel other than the first using only short blocks.

Patch by Nathan Caldwell, saintdev at gmail

Originally committed as revision 25566 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years ago100l: remove bogus inclusion of libavcodec/audioconvert.c in
Stefano Sabatini [Mon, 25 Oct 2010 04:28:36 +0000 (04:28 +0000)]
100l: remove bogus inclusion of libavcodec/audioconvert.c in

Originally committed as revision 25565 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoAdd example to the filter pad documentation.
Stefano Sabatini [Mon, 25 Oct 2010 04:15:22 +0000 (04:15 +0000)]
Add example to the filter pad documentation.

Originally committed as revision 25564 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoMove ffv1 state transition table sorting to its own function.
Michael Niedermayer [Sun, 24 Oct 2010 16:55:42 +0000 (16:55 +0000)]
Move ffv1 state transition table sorting to its own function.

Originally committed as revision 25563 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFix the case with swaping states 127 and 129 in ffv1
Michael Niedermayer [Sun, 24 Oct 2010 12:35:42 +0000 (12:35 +0000)]
Fix the case with swaping states 127 and 129 in ffv1

Originally committed as revision 25562 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoOptimize state transition table sorting in ffv1
Michael Niedermayer [Sun, 24 Oct 2010 12:31:12 +0000 (12:31 +0000)]
Optimize state transition table sorting in ffv1

Originally committed as revision 25561 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years ago2 pass mode for ffv1 to optimally order the range coder states.
Michael Niedermayer [Sun, 24 Oct 2010 12:31:09 +0000 (12:31 +0000)]
2 pass mode for ffv1 to optimally order the range coder states.

Originally committed as revision 25560 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoFactorize state_transition init out.
Michael Niedermayer [Sun, 24 Oct 2010 12:31:00 +0000 (12:31 +0000)]
Factorize state_transition init out.

Originally committed as revision 25559 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agonutdec: when parsing info packet, set metadata var only once
Anton Khirnov [Sun, 24 Oct 2010 07:28:04 +0000 (07:28 +0000)]
nutdec: when parsing info packet, set metadata var only once

Originally committed as revision 25558 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agodrop rtsp_default_protocols which is not part of public API and not used anymore
Aurelien Jacobs [Sat, 23 Oct 2010 16:22:36 +0000 (16:22 +0000)]
drop rtsp_default_protocols which is not part of public API and not used anymore

Originally committed as revision 25557 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agodrop rtp_get_file_handles() which is not part of public API and not used anymore
Aurelien Jacobs [Sat, 23 Oct 2010 16:21:49 +0000 (16:21 +0000)]
drop rtp_get_file_handles() which is not part of public API and not used anymore

Originally committed as revision 25556 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agodrop rtp_get_local_port() which is not part of public API and not used anymore
Aurelien Jacobs [Sat, 23 Oct 2010 16:20:56 +0000 (16:20 +0000)]
drop rtp_get_local_port() which is not part of public API and not used anymore

Originally committed as revision 25555 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agouse rtp_get_local_rtp_port() instead of the deprecated rtp_get_local_port()
Aurelien Jacobs [Sat, 23 Oct 2010 16:19:53 +0000 (16:19 +0000)]
use rtp_get_local_rtp_port() instead of the deprecated rtp_get_local_port()

Originally committed as revision 25554 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agodoc: fill documentation for vfwcap
Ramiro Polla [Sat, 23 Oct 2010 02:12:04 +0000 (02:12 +0000)]
doc: fill documentation for vfwcap

Originally committed as revision 25553 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agovfwcap: add option to print list of supported drivers
Ramiro Polla [Sat, 23 Oct 2010 02:11:30 +0000 (02:11 +0000)]
vfwcap: add option to print list of supported drivers

Originally committed as revision 25552 to svn://svn.ffmpeg.org/ffmpeg/trunk