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

10 years agoAdd new -slices option and use it for libvpx and libx264.
James Zern [Fri, 22 Oct 2010 18:09:14 +0000 (18:09 +0000)]
Add new -slices option and use it for libvpx and libx264.

Patch by James Zern, jzern google

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

10 years agoUse forced key frames when encoding with libxvid.
Nicolas George [Fri, 22 Oct 2010 18:01:48 +0000 (18:01 +0000)]
Use forced key frames when encoding with libxvid.

Patch by Nicolas George, nicolas D george A normalesup D org

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

10 years agoFix memleak in mjpeg decoder.
Michael Niedermayer [Fri, 22 Oct 2010 02:25:26 +0000 (02:25 +0000)]
Fix memleak in mjpeg decoder.

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

10 years agoOptimize EOB check in mjpeg decode_block() by adjusting the VLC symbol.
Michael Niedermayer [Thu, 21 Oct 2010 22:44:51 +0000 (22:44 +0000)]
Optimize EOB check in mjpeg decode_block() by adjusting the VLC symbol.

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

10 years agoSimplify last coeff check in mjpeg decode_block()
Michael Niedermayer [Thu, 21 Oct 2010 22:44:47 +0000 (22:44 +0000)]
Simplify last coeff check in mjpeg decode_block()

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

10 years agoCheck index in mjpeg AC decode against overflowing.
Michael Niedermayer [Thu, 21 Oct 2010 22:44:44 +0000 (22:44 +0000)]
Check index in mjpeg AC decode against overflowing.
This fixes a possibly exploitable buffer overflow and it will likely also be needed for future overreading fixes.

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

10 years agoAdd a seperate VLC table for progressive jpeg so we dont have to subtract 16 in the...
Michael Niedermayer [Thu, 21 Oct 2010 22:44:41 +0000 (22:44 +0000)]
Add a seperate VLC table for progressive jpeg so we dont have to subtract 16 in the inner loop.

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

10 years agoFactor code&0xf out of if() in decode_block_progressive().
Michael Niedermayer [Thu, 21 Oct 2010 22:44:37 +0000 (22:44 +0000)]
Factor code&0xf out of if() in decode_block_progressive().

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

10 years agoCleanup decode_block_progressive()
Michael Niedermayer [Thu, 21 Oct 2010 22:44:34 +0000 (22:44 +0000)]
Cleanup decode_block_progressive()

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

10 years agoFactorize ((unsigned) code) >> 4 out of decode_block_progressive() in jpeg.
Michael Niedermayer [Thu, 21 Oct 2010 22:44:31 +0000 (22:44 +0000)]
Factorize  ((unsigned) code) >> 4 out of decode_block_progressive() in jpeg.

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

10 years agoMove if() in mjpeg decode_block() to simplify condition.
Michael Niedermayer [Thu, 21 Oct 2010 22:44:28 +0000 (22:44 +0000)]
Move if() in mjpeg decode_block() to simplify condition.

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

10 years agoSimplify build_vlc() by using init_vlc_sparse() in mjpeg.
Michael Niedermayer [Thu, 21 Oct 2010 22:44:18 +0000 (22:44 +0000)]
Simplify build_vlc() by using init_vlc_sparse() in mjpeg.

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

10 years agocosmetics: align fields, and remove useless ones, in img2.c
Pascal Massimino [Thu, 21 Oct 2010 22:07:00 +0000 (22:07 +0000)]
cosmetics: align fields, and remove useless ones, in img2.c

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

10 years agoFixed DXVA_Slice_H264_Long::BitOffsetToSliceData value.
Rafaël Carré [Thu, 21 Oct 2010 18:39:57 +0000 (18:39 +0000)]
Fixed DXVA_Slice_H264_Long::BitOffsetToSliceData value.

The 8 bits offset (nal unit type) should not be added, as the spec says:

"This bit offset is the offset within the RBSP data for the slice, relative
to the starting position of the slice_header() in the RBSP"

This fixes DXVA2 support for intel GPU.

Patch by Rafaël Carré (funman _AT_ videolan _DOT_ org).

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

10 years agortsp: Move the rtsp_probe function to the demuxer code block
Martin Storsjö [Thu, 21 Oct 2010 12:25:12 +0000 (12:25 +0000)]
rtsp: Move the rtsp_probe function to the demuxer code block

This function is only used by the RTSP demuxer.

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

10 years agoRestore alphabetical order
Martin Storsjö [Thu, 21 Oct 2010 12:19:14 +0000 (12:19 +0000)]
Restore alphabetical order

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

10 years agortsp: Untangle the dependencies between the RTSP/SDP demuxers and RTSP muxer
Martin Storsjö [Thu, 21 Oct 2010 12:18:48 +0000 (12:18 +0000)]
rtsp: Untangle the dependencies between the RTSP/SDP demuxers and RTSP muxer

This allows compilation of one of them without requiring the others'
dependencies to be present.

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

10 years agortsp: Reorder functions
Martin Storsjö [Thu, 21 Oct 2010 12:13:02 +0000 (12:13 +0000)]
rtsp: Reorder functions

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

10 years agocosmetics, indentation
Baptiste Coudurier [Thu, 21 Oct 2010 06:22:54 +0000 (06:22 +0000)]
cosmetics, indentation

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

10 years ago10l fix h263+ encoder, format will be 8, array size is 8 not 7
Baptiste Coudurier [Thu, 21 Oct 2010 06:21:07 +0000 (06:21 +0000)]
10l fix h263+ encoder, format will be 8, array size is 8 not 7

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

10 years agocleanup image2pipe_{de}muxer fields
Pascal Massimino [Thu, 21 Oct 2010 00:57:53 +0000 (00:57 +0000)]
cleanup image2pipe_{de}muxer fields

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

10 years agoRemove unused variables picture_crop_temp and picture_pad_temp.
Stefano Sabatini [Wed, 20 Oct 2010 09:45:50 +0000 (09:45 +0000)]
Remove unused variables picture_crop_temp and picture_pad_temp.

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

10 years agoReplace 5 by named constant MAX_CONTEXT_INPUTS in ffv1.c
Michael Niedermayer [Tue, 19 Oct 2010 17:26:27 +0000 (17:26 +0000)]
Replace 5 by named constant MAX_CONTEXT_INPUTS in ffv1.c

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

10 years agosdp: Conditionally compile code using AF_INET6
Martin Storsjö [Tue, 19 Oct 2010 07:50:40 +0000 (07:50 +0000)]
sdp: Conditionally compile code using AF_INET6

Should fix compilation in environments unaware of IPv6.

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

10 years agoAdd a demuxer for receiving raw rtp:// URLs without an SDP description
Martin Storsjö [Tue, 19 Oct 2010 07:38:53 +0000 (07:38 +0000)]
Add a demuxer for receiving raw rtp:// URLs without an SDP description

The demuxer inspects the payload type of a received RTP packet and
handles the cases where the content is fully described by the payload type.

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

10 years agoAdd a -force_key_frames option to ffmpeg.
Nicolas George [Mon, 18 Oct 2010 21:47:15 +0000 (21:47 +0000)]
Add a -force_key_frames option to ffmpeg.

The option is useful to ensure that there is a seek point exactly at a
place the user will probably want to jump precisely sometime, the
major example would be the end of an opening and the beginning of a
chapter. The scene change detection system will often make it happen,
but not always for example if there is a fade-in.

See the thread:
Subject: [FFmpeg-devel] [PATCH] -force_key_frames option
Date: Tue, 12 Oct 2010 15:16:26 +0200

Patch by Nicolas George -mail nicolas,george,normalesup,org.

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

10 years agoAdd transpose filter.
Stefano Sabatini [Mon, 18 Oct 2010 21:29:37 +0000 (21:29 +0000)]
Add transpose filter.

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

10 years agoImplement a common get_filtered_video_frame(), shared between ffplay.c
Stefano Sabatini [Mon, 18 Oct 2010 13:57:11 +0000 (13:57 +0000)]
Implement a common get_filtered_video_frame(), shared between ffplay.c
and ffmpeg.c.

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

10 years agoMake help message for the -crop* options consistent with that of the
Stefano Sabatini [Mon, 18 Oct 2010 13:43:07 +0000 (13:43 +0000)]
Make help message for the -crop* options consistent with that of the
-pad* options and more direct.

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

10 years agoRemove -crop* options.
Stefano Sabatini [Mon, 18 Oct 2010 13:34:46 +0000 (13:34 +0000)]
Remove -crop* options.

Users are required to use the libavfilter crop filter.

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

10 years agoRemove redundant text in the log.
Stefano Sabatini [Mon, 18 Oct 2010 13:19:59 +0000 (13:19 +0000)]
Remove redundant text in the log.

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

10 years agoMake XAN decoder return meaningful error codes.
Stefano Sabatini [Mon, 18 Oct 2010 13:19:53 +0000 (13:19 +0000)]
Make XAN decoder return meaningful error codes.

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

10 years agometadata: make av_metadata_set2 case insensitive by default
Aurelien Jacobs [Mon, 18 Oct 2010 12:45:15 +0000 (12:45 +0000)]
metadata: make av_metadata_set2 case insensitive by default

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

10 years agoAvoid negative SCR in mpeg ps muxer.
Michael Niedermayer [Sat, 16 Oct 2010 21:31:31 +0000 (21:31 +0000)]
Avoid negative SCR in mpeg ps muxer.
Fixes a scr issue reported with dvdauthor ([FFmpeg-user] FFMPEG encoded MPEG-2 video causes error in DVDAuthor)

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

10 years agoMove shared functions out of CONFIG_FFV1_ENCODER ifdef
Michael Niedermayer [Sat, 16 Oct 2010 21:31:16 +0000 (21:31 +0000)]
Move shared functions out of CONFIG_FFV1_ENCODER ifdef

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

10 years agoCosmetics: use a more compact notation, improve readability and reduce
Stefano Sabatini [Sat, 16 Oct 2010 20:57:55 +0000 (20:57 +0000)]
Cosmetics: use a more compact notation, improve readability and reduce
line count.

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

10 years agoReset metadata after opt_output_file(), fix the previous commit.
Stefano Sabatini [Sat, 16 Oct 2010 16:16:01 +0000 (16:16 +0000)]
Reset metadata after opt_output_file(), fix the previous commit.

Spotted by elenril on irc.

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

10 years agoUse an AVMetadata struct for storing metadata, simplify.
Stefano Sabatini [Sat, 16 Oct 2010 15:25:02 +0000 (15:25 +0000)]
Use an AVMetadata struct for storing metadata, simplify.

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

10 years agoMake ffprobe print stream language only once, also remove usage of the
Anton Khirnov [Sat, 16 Oct 2010 14:33:05 +0000 (14:33 +0000)]
Make ffprobe print stream language only once, also remove usage of the
deprecated field AVStream.language.

Patch by Anton Khirnov %name%@%surname% dot net.

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

10 years agoRemove docs for the not anymore existing option -convert_tags.
Stefano Sabatini [Sat, 16 Oct 2010 13:55:29 +0000 (13:55 +0000)]
Remove docs for the not anymore existing option -convert_tags.

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

10 years agoadd ff_ prefix to metadata_conv()
Anton Khirnov [Sat, 16 Oct 2010 13:20:41 +0000 (13:20 +0000)]
add ff_ prefix to metadata_conv()
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

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

10 years agolavf: simplify setting the encoder ident tag.
Anton Khirnov [Sat, 16 Oct 2010 13:07:20 +0000 (13:07 +0000)]
lavf: simplify setting the encoder ident tag.
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

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

10 years agoffmpeg.c/ffprobe.c: remove all uses of av_metadata_conv()
Anton Khirnov [Sat, 16 Oct 2010 13:04:27 +0000 (13:04 +0000)]
ffmpeg.c/ffprobe.c: remove all uses of av_metadata_conv()
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

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

10 years agoAdd avfilter_graph_config().
Stefano Sabatini [Sat, 16 Oct 2010 10:20:53 +0000 (10:20 +0000)]
Add avfilter_graph_config().

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

10 years agoPlace the bitstream_filters variable in the AVOutputStream, thus
Nicolas George [Sat, 16 Oct 2010 10:06:13 +0000 (10:06 +0000)]
Place the bitstream_filters variable in the AVOutputStream, thus
greatly simplifying its handling and reducing code duplication.

Patch by Nicolas George -bsf nicolas*george|normalesup+org.

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

10 years agoMove the allocation of the AVOutputStream structure earlier in the
Nicolas George [Sat, 16 Oct 2010 10:06:10 +0000 (10:06 +0000)]
Move the allocation of the AVOutputStream structure earlier in the
code flow, in the new_video_stream() / new_audio_stream() /
new_subtitle_stream() functions.

Patch by Nicolas George <$name.$surname@normalesup.org>.

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

10 years agoFix building, include the header instead of the source file
Martin Storsjö [Sat, 16 Oct 2010 08:50:50 +0000 (08:50 +0000)]
Fix building, include the header instead of the source file

Builds only seemed to have been broken in some configurations, though.

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

10 years agoIn mov muxer, write artist metadata tag
Baptiste Coudurier [Fri, 15 Oct 2010 23:23:47 +0000 (23:23 +0000)]
In mov muxer, write artist metadata tag

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

10 years agoIn mov muxer, use correct metadata tag for encoder, and use the generic metadata...
Baptiste Coudurier [Fri, 15 Oct 2010 23:16:11 +0000 (23:16 +0000)]
In mov muxer, use correct metadata tag for encoder, and use the generic metadata api name

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

10 years agortpdec: Return AVERROR(EAGAIN) for mpegts parsing errors
Martin Storsjö [Fri, 15 Oct 2010 21:32:21 +0000 (21:32 +0000)]
rtpdec: Return AVERROR(EAGAIN) for mpegts parsing errors

This indicates that there was no error that needs to be reported to the
caller, so we can move on to parse the next packet immediately, if
available. The only error code that ff_mpegts_parse_packet can return
indicates that there was no packet to return from the provided data, for
which it returns -1.

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