OSDN Git Service

coroid/libav_saccubus.git
14 years agooups, 100l, revert unrelated hunk from commit r23266
Baptiste Coudurier [Sun, 23 May 2010 21:10:05 +0000 (21:10 +0000)]
oups, 100l, revert unrelated hunk from commit r23266

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

14 years agowrite 3gp perf tag for artist metadata
Baptiste Coudurier [Sun, 23 May 2010 21:06:11 +0000 (21:06 +0000)]
write 3gp perf tag for artist metadata

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

14 years agoalbm 3gp tag has optional track field not date
Baptiste Coudurier [Sun, 23 May 2010 21:04:39 +0000 (21:04 +0000)]
albm 3gp tag has optional track field not date

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

14 years agochange author metadata to artist in mov de/muxer
Baptiste Coudurier [Sun, 23 May 2010 21:03:14 +0000 (21:03 +0000)]
change author metadata to artist in mov de/muxer

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

14 years agoCosmetics : re-indent after last commit.
Jai Menon [Sun, 23 May 2010 19:14:59 +0000 (19:14 +0000)]
Cosmetics : re-indent after last commit.

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

14 years agoFFplay : Avoid manipulating NULL data pointers so that future checks
Jai Menon [Sun, 23 May 2010 19:13:17 +0000 (19:13 +0000)]
FFplay : Avoid manipulating NULL data pointers so that future checks
remain valid. This fixes segfaults for those cases where data copy to
this invalid pointer is attempted.

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

14 years agoPrefix value for flags with "0x", to make it clear that it is an
Stefano Sabatini [Sun, 23 May 2010 19:11:43 +0000 (19:11 +0000)]
Prefix value for flags with "0x", to make it clear that it is an
hexadecimal value.

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

14 years agoMake the nut decoder read the ff_nut_video_tags to detect codec id of
Stefano Sabatini [Sun, 23 May 2010 18:34:18 +0000 (18:34 +0000)]
Make the nut decoder read the ff_nut_video_tags to detect codec id of
the input file.

This is required as Nut codec tags are not contained in
ff_codec_bmp_tags.

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

14 years agoDefine ff_nut_video_tags and make Nut muxer and demuxer set it in
Stefano Sabatini [Sun, 23 May 2010 18:34:15 +0000 (18:34 +0000)]
Define ff_nut_video_tags and make Nut muxer and demuxer set it in
codec_tag.

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

14 years agoDocument CODEC_FLAG_EMU_EDGE and avcodec_align_dimensions interaction.
Reimar Döffinger [Sun, 23 May 2010 15:34:39 +0000 (15:34 +0000)]
Document CODEC_FLAG_EMU_EDGE and avcodec_align_dimensions interaction.

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

14 years agoAdd a md5 muxer that allows checking the md5 sums of generated streams without
Reimar Döffinger [Sun, 23 May 2010 13:07:33 +0000 (13:07 +0000)]
Add a md5 muxer that allows checking the md5 sums of generated streams without
needing an external MD5 command.

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

14 years agoAdd empty newline to separate function declarations, for better
Stefano Sabatini [Sun, 23 May 2010 10:02:30 +0000 (10:02 +0000)]
Add empty newline to separate function declarations, for better
readability.

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

14 years agoAdd an entry to APIchanges for the addition of av_get_random_seed
Martin Storsjö [Sun, 23 May 2010 09:47:18 +0000 (09:47 +0000)]
Add an entry to APIchanges for the addition of av_get_random_seed

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

14 years agoBump libavutil minor version for the addition of av_get_random_seed
Martin Storsjö [Sun, 23 May 2010 09:45:34 +0000 (09:45 +0000)]
Bump libavutil minor version for the addition of av_get_random_seed

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

14 years agoMake ff_random_get_seed public, rename to av_get_random_seed, export the header
Martin Storsjö [Sun, 23 May 2010 08:53:40 +0000 (08:53 +0000)]
Make ff_random_get_seed public, rename to av_get_random_seed, export the header

Keep an old ff_ named function for binary compatibility until the
next major bump.

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

14 years agoMake av_write_header() return AVERROR(EINVAL) rather than -1 if the
Stefano Sabatini [Sat, 22 May 2010 21:52:06 +0000 (21:52 +0000)]
Make av_write_header() return AVERROR(EINVAL) rather than -1 if the
input parameters are not valid.

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

14 years agoStore in a dedicated array the format name - codec id - codec type
Stefano Sabatini [Sat, 22 May 2010 21:52:02 +0000 (21:52 +0000)]
Store in a dedicated array the format name - codec id - codec type
mapping. Simplify.

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

14 years agoOpen 2-pass logfile in binary mode for both reading and writing.
Ramiro Polla [Sat, 22 May 2010 21:32:57 +0000 (21:32 +0000)]
Open 2-pass logfile in binary mode for both reading and writing.
This fixes a regression on Windows introduced by r22769 in which the data read
from the file was not properly zero terminated. The file was read as text,
which caused the \r characters to be suppressed. Since the zero termination
happens at the end of the buffer, and there was one byte less read per line,
this caused the remaining space on the buffer to contain random data.

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

14 years agoMove AVCodecTag from riff.h into internal.h.
Francesco Lavra [Sat, 22 May 2010 16:01:32 +0000 (16:01 +0000)]
Move AVCodecTag from riff.h into internal.h.

Patch by Francesco Lavra, francescolavra interfree it

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

14 years agoPrefer enum CodecID over int in ff_codec_get_tag().
Stefano Sabatini [Sat, 22 May 2010 15:56:49 +0000 (15:56 +0000)]
Prefer enum CodecID over int in ff_codec_get_tag().

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

14 years agoUpdate regression tests after removing track timecode scale from mkvenc
David Conrad [Sat, 22 May 2010 02:13:01 +0000 (02:13 +0000)]
Update regression tests after removing track timecode scale from mkvenc

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

14 years agomatroskaenc: Don't write track timecode scale
David Conrad [Sat, 22 May 2010 01:41:38 +0000 (01:41 +0000)]
matroskaenc: Don't write track timecode scale

It's not required for mkv and unsupported in webm

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

14 years agomatroskadec: Allow unknown EBML doctype
David Conrad [Sat, 22 May 2010 01:41:35 +0000 (01:41 +0000)]
matroskadec: Allow unknown EBML doctype

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

14 years agomatroskadec: Support webm doctype
James Zern [Sat, 22 May 2010 01:41:32 +0000 (01:41 +0000)]
matroskadec: Support webm doctype

Patch by James Zern <jzern at google>

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

14 years agoRename pixelFormatBpsAVI to pix_fmt_bps_avi and pixelFormatBpsMOV to
Stefano Sabatini [Fri, 21 May 2010 23:19:50 +0000 (23:19 +0000)]
Rename pixelFormatBpsAVI to pix_fmt_bps_avi and pixelFormatBpsMOV to
pix_fmt_bps_mov.

The new names are consistent with the predominant FFmpeg style.

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

14 years agoRename findPixelFormat() to find_pix_fmt().
Stefano Sabatini [Fri, 21 May 2010 23:19:45 +0000 (23:19 +0000)]
Rename findPixelFormat() to find_pix_fmt().

Less ugly and more consistent with the FFmpeg predominant style.

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

14 years agoremove unused field
Baptiste Coudurier [Fri, 21 May 2010 21:41:38 +0000 (21:41 +0000)]
remove unused field

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

14 years agoIn ogg muxer, pack multiple frames into one page, much lower overhead
Baptiste Coudurier [Fri, 21 May 2010 21:38:54 +0000 (21:38 +0000)]
In ogg muxer, pack multiple frames into one page, much lower overhead

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

14 years agoffserver: Avoid busylooping while reading non-blocking input
Howard Chu [Fri, 21 May 2010 07:59:12 +0000 (07:59 +0000)]
ffserver: Avoid busylooping while reading non-blocking input

Patch by Howard Chu, hyc at highlandsun dot com

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

14 years agoChange the default codecs for the rtsp muxer to mpeg4 and aac
Martin Storsjö [Fri, 21 May 2010 07:12:33 +0000 (07:12 +0000)]
Change the default codecs for the rtsp muxer to mpeg4 and aac

These codecs in RTP are supported by many players.

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

14 years agoTake ff_write_chained in use in the mov rtp hinter and in the rtsp muxer
Martin Storsjö [Fri, 21 May 2010 07:08:29 +0000 (07:08 +0000)]
Take ff_write_chained in use in the mov rtp hinter and in the rtsp muxer

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

14 years agoAdd a libavformat internal function ff_write_chained
Martin Storsjö [Fri, 21 May 2010 07:07:57 +0000 (07:07 +0000)]
Add a libavformat internal function ff_write_chained

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

14 years agoRename ff_raw_pixelFormatTags symbol to ff_raw_pix_fmt_tags.
Stefano Sabatini [Thu, 20 May 2010 23:09:11 +0000 (23:09 +0000)]
Rename ff_raw_pixelFormatTags symbol to ff_raw_pix_fmt_tags.

The new name is shorter and consistent with the FFmpeg style.

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

14 years agoFix doxy reference to unexisting function.
Stefano Sabatini [Thu, 20 May 2010 21:27:01 +0000 (21:27 +0000)]
Fix doxy reference to unexisting function.

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

14 years agoDisable non interleaved avi code when there is no index available.
Michael Niedermayer [Thu, 20 May 2010 18:34:44 +0000 (18:34 +0000)]
Disable non interleaved avi code when there is no index available.
Fixes issue1956.

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

14 years agoCosmetics: make more compact the code for handle_jpeg(), this also allows
Stefano Sabatini [Wed, 19 May 2010 22:56:41 +0000 (22:56 +0000)]
Cosmetics: make more compact the code for handle_jpeg(), this also allows
vertical alignment. Improve readability.

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

14 years agoChange eval API to take parent log context and log level offset.
Michael Niedermayer [Wed, 19 May 2010 22:55:29 +0000 (22:55 +0000)]
Change eval API to take parent log context and log level offset.
this is based on stefanos work, especially all bugs are his fault ;)

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

14 years agoPrint parent log context too, if available.
Michael Niedermayer [Wed, 19 May 2010 22:51:38 +0000 (22:51 +0000)]
Print parent log context too, if available.

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

14 years agoMake it possible for a log context to keep track of its parent context.
Michael Niedermayer [Wed, 19 May 2010 22:50:39 +0000 (22:50 +0000)]
Make it possible for a log context to keep track of its parent context.
This is usefull to keep track and display relations where things are a
bit more complex (like AVProtocols or demuxers used by demuxers and such)

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

14 years agoRemove PI definition and use M_PI instead.
Stefano Sabatini [Wed, 19 May 2010 22:49:04 +0000 (22:49 +0000)]
Remove PI definition and use M_PI instead.

M_PI is defined by the included file libavutil/mathematics.h.

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

14 years agoav_default_item_name() so Simply AVClasses need 1 function less.
Michael Niedermayer [Wed, 19 May 2010 22:45:04 +0000 (22:45 +0000)]
av_default_item_name() so Simply AVClasses need 1 function less.

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

14 years agofix x264 encoding when delay is > number of input frames
Baptiste Coudurier [Wed, 19 May 2010 20:48:29 +0000 (20:48 +0000)]
fix x264 encoding when delay is > number of input frames

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

14 years agoAdd a chomp BSF to consume zero padding at the end of a packet.
Alex Converse [Wed, 19 May 2010 20:18:40 +0000 (20:18 +0000)]
Add a chomp BSF to consume zero padding at the end of a packet.

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

14 years agoMake aac_decode_frame() consume zero padding at the end of a packet.
Alex Converse [Wed, 19 May 2010 20:18:34 +0000 (20:18 +0000)]
Make aac_decode_frame() consume zero padding at the end of a packet.

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

14 years agoBump minor version for CODEC_ID_VP8
David Conrad [Wed, 19 May 2010 20:13:50 +0000 (20:13 +0000)]
Bump minor version for CODEC_ID_VP8

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

14 years agoAdd VP80 fourcc
Google [Wed, 19 May 2010 16:50:12 +0000 (16:50 +0000)]
Add VP80 fourcc

Patch by Google

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

14 years agomatroska: Add V_VP8
Google [Wed, 19 May 2010 16:50:06 +0000 (16:50 +0000)]
matroska: Add V_VP8

Patch by Google

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

14 years agoAdd VP8 CODEC_ID
Google [Wed, 19 May 2010 16:50:00 +0000 (16:50 +0000)]
Add VP8 CODEC_ID

Patch by Google

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

14 years ago13% faster yuv420 to rgb15 mmx.
Loren Merritt [Wed, 19 May 2010 13:31:11 +0000 (13:31 +0000)]
13% faster yuv420 to rgb15 mmx.
It is now faster than the old gpl version on conroe.

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

14 years agoFix a crash when opening WMS RTSP streams
Martin Storsjö [Wed, 19 May 2010 09:46:29 +0000 (09:46 +0000)]
Fix a crash when opening WMS RTSP streams
Fixes issue 1948

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

14 years ago40% faster yuv420 to rgb24 mmx.
Loren Merritt [Wed, 19 May 2010 08:21:56 +0000 (08:21 +0000)]
40% faster yuv420 to rgb24 mmx.
It is now faster than the old gpl version on conroe.

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

14 years agoAdd an APIchanges note regarding the new rtp hinting flag
Martin Storsjö [Wed, 19 May 2010 08:16:25 +0000 (08:16 +0000)]
Add an APIchanges note regarding the new rtp hinting flag

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

14 years agoLate bump of the minor version, for the addition of AVFMT_FLAG_RTP_HINT
Martin Storsjö [Wed, 19 May 2010 08:13:13 +0000 (08:13 +0000)]
Late bump of the minor version, for the addition of AVFMT_FLAG_RTP_HINT

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

14 years agoAdd a changelog entry for the RTP hinting in the mov muxer
Martin Storsjö [Wed, 19 May 2010 08:12:15 +0000 (08:12 +0000)]
Add a changelog entry for the RTP hinting in the mov muxer

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

14 years agoFix signedness of q_delta field of the IVIMbInfo.
Maxim Poliakovski [Wed, 19 May 2010 06:46:50 +0000 (06:46 +0000)]
Fix signedness of q_delta field of the IVIMbInfo.
Patch by Maxim max_pole () gmx * de

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

14 years agomatroskadec: Free ebml binary buffer on error
David Conrad [Tue, 18 May 2010 21:21:37 +0000 (21:21 +0000)]
matroskadec: Free ebml binary buffer on error

Based on a Chromium patch

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

14 years agomatroskadec: Fix buffer overread in matroska_ebmlnum_uint
David Conrad [Tue, 18 May 2010 21:21:32 +0000 (21:21 +0000)]
matroskadec: Fix buffer overread in matroska_ebmlnum_uint

Based on a Chromium patch

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

14 years agomatroskadec: Ensure time_scale is nonzero, fixes divide-by-zero if the file
David Conrad [Tue, 18 May 2010 21:21:28 +0000 (21:21 +0000)]
matroskadec: Ensure time_scale is nonzero, fixes divide-by-zero if the file
has 0 written

Based on a Chromium patch

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

14 years agomatroskadec: Use av_freep in ebml_read_ascii
David Conrad [Tue, 18 May 2010 21:21:23 +0000 (21:21 +0000)]
matroskadec: Use av_freep in ebml_read_ascii

Based on a Chromium patch

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

14 years agoUse a heuristic for describing the RTP packets using sample data
Martin Storsjö [Tue, 18 May 2010 19:48:25 +0000 (19:48 +0000)]
Use a heuristic for describing the RTP packets using sample data

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

14 years agoAdd initial support for RTP hinting in the mov muxer
Martin Storsjö [Tue, 18 May 2010 19:47:24 +0000 (19:47 +0000)]
Add initial support for RTP hinting in the mov muxer

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

14 years agoMake mov_write_packet non-static, add ff_ prefix
Martin Storsjö [Tue, 18 May 2010 19:40:17 +0000 (19:40 +0000)]
Make mov_write_packet non-static, add ff_ prefix

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

14 years agoMove the mov muxer structures to a separate header
Martin Storsjö [Tue, 18 May 2010 19:38:37 +0000 (19:38 +0000)]
Move the mov muxer structures to a separate header

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

14 years agoAdd a flag for enabling RTP hinting
Martin Storsjö [Tue, 18 May 2010 19:34:21 +0000 (19:34 +0000)]
Add a flag for enabling RTP hinting

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

14 years agoMake ff_sdp_write_media a lavf-internal function
Martin Storsjö [Tue, 18 May 2010 19:32:59 +0000 (19:32 +0000)]
Make ff_sdp_write_media a lavf-internal function

This is in preparation for RTP hinting in the MOV muxer, where
it needs to be able to create SDP fragments for each media stream.

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

14 years agoValidate AVCodecTag vs CodecID.
Francesco Lavra [Tue, 18 May 2010 19:23:29 +0000 (19:23 +0000)]
Validate AVCodecTag vs CodecID.

Patch by Francesco Lavra, francescolavra interfree it

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

14 years agoFactorize some code into the new function ff_toupper4().
Francesco Lavra [Tue, 18 May 2010 19:16:40 +0000 (19:16 +0000)]
Factorize some code into the new function ff_toupper4().

Patch by Francesco Lavra, francescolavra interfree it

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

14 years agoIn ts demuxer, output pes packet as soon as they are complete.
Janne Grunau [Tue, 18 May 2010 17:28:07 +0000 (17:28 +0000)]
In ts demuxer, output pes packet as soon as they are complete.
This is needed for subtitles where packets are infrequent.
Patch by Janne Grunau, janne-ffmpeg at jannau dot net.

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

14 years agoCosmetics: reindent
Martin Storsjö [Tue, 18 May 2010 11:46:23 +0000 (11:46 +0000)]
Cosmetics: reindent

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

14 years agoffserver: Don't set me_method unconditionally
Howard Chu [Tue, 18 May 2010 11:45:09 +0000 (11:45 +0000)]
ffserver: Don't set me_method unconditionally

Patch by Howard Chu, hyc at highlandsun dot com

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

14 years agoffserver: Write proper GMT date/times in Date headers
Howard Chu [Tue, 18 May 2010 11:16:12 +0000 (11:16 +0000)]
ffserver: Write proper GMT date/times in Date headers

Patch by Howard Chu, hyc at highlandsun dot com

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

14 years agoAdd log_level_offset to AVCodecContext.
Stefano Sabatini [Mon, 17 May 2010 22:49:34 +0000 (22:49 +0000)]
Add log_level_offset to AVCodecContext.

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

14 years agoset avg frame rate in mkv demuxer
Baptiste Coudurier [Mon, 17 May 2010 18:12:58 +0000 (18:12 +0000)]
set avg frame rate in mkv demuxer

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

14 years agoffserver: Make sure a destination URL is set when creating the SDP
Martin Storsjö [Mon, 17 May 2010 17:34:13 +0000 (17:34 +0000)]
ffserver: Make sure a destination URL is set when creating the SDP

Debugged by Howard Chu, hyc at highlandsun dot com.

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

14 years agoFix typo ('B', 'O', 'W', '1') => ('B', '0', 'W', '1')
Benoit Fouet [Mon, 17 May 2010 09:53:59 +0000 (09:53 +0000)]
Fix typo ('B', 'O', 'W', '1') => ('B', '0', 'W', '1')

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

14 years agoChange the order of parameters for ff_eval_expr() and
Stefano Sabatini [Sun, 16 May 2010 23:00:22 +0000 (23:00 +0000)]
Change the order of parameters for ff_eval_expr() and
ff_parse_and_eval_expr(), place the names for constants/functions
before the corresponding values.

This looks more readable, as the user is expected to know the names
before the values.

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

14 years agoFactorize code into a single function.
Sebastian Vater [Sun, 16 May 2010 21:03:08 +0000 (21:03 +0000)]
Factorize code into a single function.

Patch by Sebastian Vater, cdgs D basty A gmail

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

14 years agouse filter name when graph parser add filters
Baptiste Coudurier [Sun, 16 May 2010 18:13:55 +0000 (18:13 +0000)]
use filter name when graph parser add filters

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

14 years agoAdd missing rawvideo pixel formats to codec tags mappings for nut.
Stefano Sabatini [Sun, 16 May 2010 17:08:47 +0000 (17:08 +0000)]
Add missing rawvideo pixel formats to codec tags mappings for nut.

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

14 years agoAdd NV12 and NV21 AVI tags.
Stefano Sabatini [Sun, 16 May 2010 07:56:31 +0000 (07:56 +0000)]
Add NV12 and NV21 AVI tags.

Both are listed in fourcc.org.

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

14 years agoClarify description for the MONOWHITE and MONOBLACK pixel formats.
Stefano Sabatini [Sun, 16 May 2010 07:56:26 +0000 (07:56 +0000)]
Clarify description for the MONOWHITE and MONOBLACK pixel formats.

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

14 years agoAvoid mixed declaration and code, fix C89 compatibility.
François Revol [Sat, 15 May 2010 17:34:45 +0000 (17:34 +0000)]
Avoid mixed declaration and code, fix C89 compatibility.

Patch by François Revol revol free fr.

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

14 years agoClarify descriptions for RGB4, BGR4, NV12, NV21,
Stefano Sabatini [Sat, 15 May 2010 12:33:31 +0000 (12:33 +0000)]
Clarify descriptions for RGB4, BGR4, NV12, NV21,
RGB48BE, and RGB48LE pixel formats.

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

14 years agoReindent after last commit on dxva2 h264 AVHWAccel.
Laurent Aimar [Fri, 14 May 2010 23:09:08 +0000 (23:09 +0000)]
Reindent after last commit on dxva2 h264 AVHWAccel.

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

14 years agoFixed h264 long term support with dxva2 AVHWAccel.
Laurent Aimar [Fri, 14 May 2010 23:08:23 +0000 (23:08 +0000)]
Fixed h264 long term support with dxva2 AVHWAccel.

Based on a commit for vaapi(r22869).

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

14 years agoChange MAX_READ_SIZE message during av_find_stream_info to DEBUG level.
Baptiste Coudurier [Fri, 14 May 2010 22:04:39 +0000 (22:04 +0000)]
Change MAX_READ_SIZE message during av_find_stream_info to DEBUG level.
It is not harmful and it scares too many users.

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

14 years agofmaxf -> FFMAX to fix pre-C99 systems
Alex Converse [Fri, 14 May 2010 19:38:17 +0000 (19:38 +0000)]
fmaxf -> FFMAX to fix pre-C99 systems

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

14 years agoChange inter-protocol dependencies from _deps to _select
Martin Storsjö [Fri, 14 May 2010 18:51:46 +0000 (18:51 +0000)]
Change inter-protocol dependencies from _deps to _select

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

14 years agoaacenc: Add a rate only trellis for codebook selection for the TLS.
Alex Converse [Fri, 14 May 2010 16:49:51 +0000 (16:49 +0000)]
aacenc: Add a rate only trellis for codebook selection for the TLS.

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

14 years agoaacenc: Use exact values when quantizing, not fuzzy values.
Alex Converse [Fri, 14 May 2010 16:49:40 +0000 (16:49 +0000)]
aacenc: Use exact values when quantizing, not fuzzy values.

This requires us to code small escapes; we can't avoid it.

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

14 years agoaacenc: Use an estimated codebook for the TLS (two loop search).
Alex Converse [Fri, 14 May 2010 16:49:30 +0000 (16:49 +0000)]
aacenc: Use an estimated codebook for the TLS (two loop search).

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

14 years agoaacenc: Select the TLS (two-loop search) as the default scalefactor coder.
Alex Converse [Fri, 14 May 2010 16:49:21 +0000 (16:49 +0000)]
aacenc: Select the TLS (two-loop search) as the default scalefactor coder.

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

14 years agoaacenc: Fix psy logic.
Alex Converse [Fri, 14 May 2010 16:49:11 +0000 (16:49 +0000)]
aacenc: Fix psy logic.

Set band info before determining scalefactors. Use the look ahead for
windowing decision.

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

14 years agoFix compilation of AC3 decoder if E-AC3 decoder was disabled.
Carl Eugen Hoyos [Thu, 13 May 2010 20:41:36 +0000 (20:41 +0000)]
Fix compilation of AC3 decoder if E-AC3 decoder was disabled.

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

14 years agoqt-faststart: Abort scanning of the input file if a badly sized atom is encountered
Martin Storsjö [Thu, 13 May 2010 19:22:56 +0000 (19:22 +0000)]
qt-faststart: Abort scanning of the input file if a badly sized atom is encountered

If the atom size is 0, qt-faststart currently hangs forever while scanning
the file.

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

14 years agoReindent after r23124. Patch by Sebastian Vater <cdgs basty googlemail com>.
Sebastian Vater [Thu, 13 May 2010 19:18:54 +0000 (19:18 +0000)]
Reindent after r23124. Patch by Sebastian Vater <cdgs basty googlemail com>.

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

14 years agoCosmetics: Initialize pointers with NULL instead of 0, for consistency
Martin Storsjö [Thu, 13 May 2010 19:18:27 +0000 (19:18 +0000)]
Cosmetics: Initialize pointers with NULL instead of 0, for consistency

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

14 years agoCosmetics: reindent
Martin Storsjö [Thu, 13 May 2010 19:17:49 +0000 (19:17 +0000)]
Cosmetics: reindent

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

14 years agoqt-faststart: Use the error_out cleanup code path for all error returns
Martin Storsjö [Thu, 13 May 2010 19:17:15 +0000 (19:17 +0000)]
qt-faststart: Use the error_out cleanup code path for all error returns

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

14 years agoGrayscale support. Patch by Sebastian Vater <cdgs basty googlemail com>.
Sebastian Vater [Thu, 13 May 2010 19:16:03 +0000 (19:16 +0000)]
Grayscale support. Patch by Sebastian Vater <cdgs basty googlemail com>.

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