ffmpeg.git
9 years agoFix typo, -flags 4mv => -flags mv4.
Stefano Sabatini [Sun, 3 Oct 2010 17:15:18 +0000 (17:15 +0000)]
Fix typo, -flags 4mv => -flags mv4.

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

9 years agortsp: In the muxer, show the generated with verbose log level
Martin Storsjö [Sun, 3 Oct 2010 11:56:38 +0000 (11:56 +0000)]
rtsp: In the muxer, show the generated with verbose log level

It is only useful for debugging, so it doesn't have to be shown every time.

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

9 years agortsp: Show the received SDP
Martin Storsjö [Sun, 3 Oct 2010 11:55:16 +0000 (11:55 +0000)]
rtsp: Show the received SDP

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

9 years agoUse SLIBSUF instead of .so, as a more generic dynamic library suffix.
Víctor Paesa [Sun, 3 Oct 2010 09:49:36 +0000 (09:49 +0000)]
Use SLIBSUF instead of .so, as a more generic dynamic library suffix.

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

9 years ago100l, fix sws_getCachedContext. It did not set the colorspace details,
Reimar Döffinger [Sun, 3 Oct 2010 07:53:40 +0000 (07:53 +0000)]
100l, fix sws_getCachedContext. It did not set the colorspace details,
but worse it did not set up destination dimensions, thus every user
of it would necessarily fail.

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

9 years agoAdd the CODEC_CAP_CHANNEL_CONF capability code and add
Benjamin Larsson [Sat, 2 Oct 2010 22:18:02 +0000 (22:18 +0000)]
Add the CODEC_CAP_CHANNEL_CONF capability code and add
that flag to the dca codec. This capability when set
will make sure the codec will initialize the channel
configuration instead of trusting the container. This
fixes issue 2137 and issue 850.

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

9 years agoapplehttp: Add comments to make_absolute_url
Martin Storsjö [Sat, 2 Oct 2010 21:59:16 +0000 (21:59 +0000)]
applehttp: Add comments to make_absolute_url

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

9 years agoapplehttp: Handle a .. path segment in the base url
Martin Storsjö [Sat, 2 Oct 2010 21:58:36 +0000 (21:58 +0000)]
applehttp: Handle a .. path segment in the base url

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

9 years agoReindent
Martin Storsjö [Sat, 2 Oct 2010 21:58:13 +0000 (21:58 +0000)]
Reindent

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

9 years agoapplehttp: Allow the base url to be a local file name, too
Martin Storsjö [Sat, 2 Oct 2010 21:57:58 +0000 (21:57 +0000)]
applehttp: Allow the base url to be a local file name, too

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

9 years agoSupport decoding of FLAC files without a STREAMINFO header.
Justin Ruggles [Sat, 2 Oct 2010 20:37:43 +0000 (20:37 +0000)]
Support decoding of FLAC files without a STREAMINFO header.

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

9 years agoRemove pointless -vn option, the file has no video stream.
Reimar Döffinger [Sat, 2 Oct 2010 10:00:48 +0000 (10:00 +0000)]
Remove pointless -vn option, the file has no video stream.

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

9 years agoRename fate-gsm test to the more accurate fate-gsm-ms
Reimar Döffinger [Sat, 2 Oct 2010 09:56:21 +0000 (09:56 +0000)]
Rename fate-gsm test to the more accurate fate-gsm-ms
and add a test for regular GSM as fate-gsm.

Fixes a 8kHz sample from issue 113.

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

9 years agoFix GSM decoding: regular GSM and MSGSM do not use the same
Reimar Döffinger [Sat, 2 Oct 2010 09:51:26 +0000 (09:51 +0000)]
Fix GSM decoding: regular GSM and MSGSM do not use the same
bitstream endianness, so they cannot reuse the same code
without a lot of function call overhead.
Thus use templating to compile two different binaries.

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

9 years agoAvoid cast of double nan to int.
Stefano Sabatini [Sat, 2 Oct 2010 09:50:56 +0000 (09:50 +0000)]
Avoid cast of double nan to int.
It may cause exceptions on some platform.

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

9 years agoDocument url_get_filename().
Stefano Sabatini [Sat, 2 Oct 2010 09:16:52 +0000 (09:16 +0000)]
Document url_get_filename().

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

9 years agoAdd init and uninit functions to cmdutils, reduces code duplication
Reimar Döffinger [Sat, 2 Oct 2010 08:44:33 +0000 (08:44 +0000)]
Add init and uninit functions to cmdutils, reduces code duplication
between ffmpeg and ffplay and avoids a valgrind error by freeing
avformat_opts->key.

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

9 years agoMake FRAPS decoder use PC range instead of TV range
Jason Garrett-Glaser [Sat, 2 Oct 2010 08:39:34 +0000 (08:39 +0000)]
Make FRAPS decoder use PC range instead of TV range
FRAPS appears to output PC range streams.  I can't guarantee this is true of
all versions.

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

9 years ago10l fix h263 encoder resolution test, array size is 8 not 7
Baptiste Coudurier [Sat, 2 Oct 2010 01:26:00 +0000 (01:26 +0000)]
10l fix h263 encoder resolution test, array size is 8 not 7

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

9 years agoffmpeg: replace MAX_STREAMS by an arbitrary sanity check
Aurelien Jacobs [Fri, 1 Oct 2010 21:56:09 +0000 (21:56 +0000)]
ffmpeg: replace MAX_STREAMS by an arbitrary sanity check

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

9 years agoffmpeg: dynamically allocate bitstream_filters
Aurelien Jacobs [Fri, 1 Oct 2010 21:54:20 +0000 (21:54 +0000)]
ffmpeg: dynamically allocate bitstream_filters

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

9 years agoffmpeg: dynamically allocate stream_maps
Aurelien Jacobs [Fri, 1 Oct 2010 21:52:09 +0000 (21:52 +0000)]
ffmpeg: dynamically allocate stream_maps

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

9 years agoffmpeg: dynamically allocate output_codecs
Aurelien Jacobs [Fri, 1 Oct 2010 21:51:12 +0000 (21:51 +0000)]
ffmpeg: dynamically allocate output_codecs

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

9 years agoffmpeg: dynamically allocate input_codecs
Aurelien Jacobs [Fri, 1 Oct 2010 21:41:27 +0000 (21:41 +0000)]
ffmpeg: dynamically allocate input_codecs

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

9 years agoffmpeg: dynamically allocate input_files_ts_scale
Aurelien Jacobs [Fri, 1 Oct 2010 21:36:13 +0000 (21:36 +0000)]
ffmpeg: dynamically allocate input_files_ts_scale

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

9 years agoffmpeg: dynamically allocate streamid_map
Aurelien Jacobs [Fri, 1 Oct 2010 21:34:59 +0000 (21:34 +0000)]
ffmpeg: dynamically allocate streamid_map

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

9 years agoffmpeg: add a grow_array() helper function
Aurelien Jacobs [Fri, 1 Oct 2010 21:29:37 +0000 (21:29 +0000)]
ffmpeg: add a grow_array() helper function

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

9 years agoFix reference to nonexistent function.
Stefano Sabatini [Fri, 1 Oct 2010 18:32:53 +0000 (18:32 +0000)]
Fix reference to nonexistent function.

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

9 years agortsp: Return a queued packet if it has been in the queue for longer than max_delay
Martin Storsjö [Fri, 1 Oct 2010 17:52:26 +0000 (17:52 +0000)]
rtsp: Return a queued packet if it has been in the queue for longer than max_delay

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

9 years agortpdec: Reorder received RTP packets according to the seq number
Martin Storsjö [Fri, 1 Oct 2010 17:50:24 +0000 (17:50 +0000)]
rtpdec: Reorder received RTP packets according to the seq number

Reordering is enabled only when receiving over UDP.

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

9 years agortpdec: Split out the part of rtp_parse_packet that does the parsing of new packets
Martin Storsjö [Fri, 1 Oct 2010 17:46:10 +0000 (17:46 +0000)]
rtpdec: Split out the part of rtp_parse_packet that does the parsing of new packets

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

9 years agoFix indentation of ff_id3v2_read
Reimar Döffinger [Fri, 1 Oct 2010 17:45:18 +0000 (17:45 +0000)]
Fix indentation of ff_id3v2_read

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

9 years agoReindent/rewrap
Martin Storsjö [Fri, 1 Oct 2010 17:44:53 +0000 (17:44 +0000)]
Reindent/rewrap

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

9 years agortsp: Reorganize if statements in rtsp_read_play
Martin Storsjö [Fri, 1 Oct 2010 17:44:18 +0000 (17:44 +0000)]
rtsp: Reorganize if statements in rtsp_read_play

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

9 years agortsp/rtpdec: Allow rtp_parse_packet to take ownership of the packet buffer
Martin Storsjö [Fri, 1 Oct 2010 17:43:27 +0000 (17:43 +0000)]
rtsp/rtpdec: Allow rtp_parse_packet to take ownership of the packet buffer

Do the same change for ff_rdt_parse_packet, too, to keep the interfaces
similar.

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

9 years agortsp: Use a dynamically allocated receive buffer
Martin Storsjö [Fri, 1 Oct 2010 17:41:31 +0000 (17:41 +0000)]
rtsp: Use a dynamically allocated receive buffer

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

9 years agoFix weird indent.
Stefano Sabatini [Fri, 1 Oct 2010 16:02:10 +0000 (16:02 +0000)]
Fix weird indent.

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

9 years agoavassert: add missing #include <stdlib.h>
Måns Rullgård [Fri, 1 Oct 2010 13:55:20 +0000 (13:55 +0000)]
avassert: add missing #include <stdlib.h>

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

9 years agoavassert: prettify macro
Måns Rullgård [Fri, 1 Oct 2010 13:55:16 +0000 (13:55 +0000)]
avassert: prettify macro

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

9 years agoRename libavutil/assert.h to avassert.h
Måns Rullgård [Fri, 1 Oct 2010 13:55:13 +0000 (13:55 +0000)]
Rename libavutil/assert.h to avassert.h

This avoids conflicts with the system assert.h.

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

9 years agoFix av_cmp_q() with negative denominators.
Michael Niedermayer [Fri, 1 Oct 2010 12:00:29 +0000 (12:00 +0000)]
Fix av_cmp_q() with negative denominators.

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

9 years agoAdd myself as maintainer of lxfdec.c
Tomas Härdin [Fri, 1 Oct 2010 11:08:28 +0000 (11:08 +0000)]
Add myself as maintainer of lxfdec.c

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

9 years agoAdd demuxer for LXF (Leitch/Harris' VR native stream format)
Tomas Härdin [Fri, 1 Oct 2010 11:08:24 +0000 (11:08 +0000)]
Add demuxer for LXF (Leitch/Harris' VR native stream format)

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

9 years agoAdd pcm_lxf, a decoder for the 20-bit planar PCM format used in LXF
Tomas Härdin [Fri, 1 Oct 2010 11:08:19 +0000 (11:08 +0000)]
Add pcm_lxf, a decoder for the 20-bit planar PCM format used in LXF

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

9 years agoFix a typo in the nameing of av_assert0() in currently not compiled code.
Michael Niedermayer [Thu, 30 Sep 2010 22:52:29 +0000 (22:52 +0000)]
Fix a typo in the nameing of av_assert0() in currently not compiled code.

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

9 years agoav_assert() system.
Michael Niedermayer [Thu, 30 Sep 2010 21:57:31 +0000 (21:57 +0000)]
av_assert() system.
With this the developer can now choose if he wants an assert always enabled or at which
compile time assert level. This can thus replace the #define NDEBUG hacks

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

9 years agoadd FF_API_INOFFICIAL define to disable the deprecated 'inofficial' flag
Aurelien Jacobs [Thu, 30 Sep 2010 20:40:10 +0000 (20:40 +0000)]
add FF_API_INOFFICIAL define to disable the deprecated 'inofficial' flag

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

9 years agoadd FF_API_SET_STRING_OLD define to disable the deprecated av_set_string API
Aurelien Jacobs [Thu, 30 Sep 2010 20:34:35 +0000 (20:34 +0000)]
add FF_API_SET_STRING_OLD define to disable the deprecated av_set_string API

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

9 years agoadd FF_API_USE_LPC define to disable the deprecated AVCodecContext.use_lpc field
Aurelien Jacobs [Thu, 30 Sep 2010 20:31:42 +0000 (20:31 +0000)]
add FF_API_USE_LPC define to disable the deprecated AVCodecContext.use_lpc field

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

9 years agoReturn AVERROR(EINVAL) rather than -1 in case of invalid values.
Stefano Sabatini [Thu, 30 Sep 2010 20:24:49 +0000 (20:24 +0000)]
Return AVERROR(EINVAL) rather than -1 in case of invalid values.

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

9 years agoadd FF_API_SUBTITLE_OLD define to disable the deprecated decode_subtitle API
Aurelien Jacobs [Thu, 30 Sep 2010 20:12:46 +0000 (20:12 +0000)]
add FF_API_SUBTITLE_OLD define to disable the deprecated decode_subtitle API

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

9 years agoadd FF_API_VIDEO_OLD define to disable the deprecated decode_video API
Aurelien Jacobs [Thu, 30 Sep 2010 19:51:22 +0000 (19:51 +0000)]
add FF_API_VIDEO_OLD define to disable the deprecated decode_video API

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

9 years agoCorrect tag is m2v1
Baptiste Coudurier [Thu, 30 Sep 2010 18:12:27 +0000 (18:12 +0000)]
Correct tag is m2v1

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

9 years agoadd FF_API_AUDIO_OLD define to disable the deprecated decode_audio API
Aurelien Jacobs [Thu, 30 Sep 2010 15:37:01 +0000 (15:37 +0000)]
add FF_API_AUDIO_OLD define to disable the deprecated decode_audio API

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

9 years agoFix a yuv420p sample that was incorrectly detected as yuv411p
Niobos [Thu, 30 Sep 2010 12:26:42 +0000 (12:26 +0000)]
Fix a yuv420p sample that was incorrectly detected as yuv411p
(576i50 25Mbps 4:1:1 special case was wrong).
Fixes issue2211

Patch by Niobos, niobos dest-unreach be

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

9 years agoDocument url_filesize().
Stefano Sabatini [Thu, 30 Sep 2010 10:55:08 +0000 (10:55 +0000)]
Document url_filesize().

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

9 years agoMake register_protocol() use the function av_register_protocol2()
Stefano Sabatini [Thu, 30 Sep 2010 10:51:22 +0000 (10:51 +0000)]
Make register_protocol() use the function av_register_protocol2()
rather than av_register_protocol(), which is deprecated.
Fix the GCC warning:
avio.c: In function ‘register_protocol’:
avio.c:93: warning: ‘av_register_protocol’ is deprecated (declared at avio.c:86)

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

9 years agoUser application side of Codec specific parameters.
Michael Niedermayer [Wed, 29 Sep 2010 23:06:51 +0000 (23:06 +0000)]
User application side of Codec specific parameters.

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

9 years agoSet default values for the scale context in sws_alloc_context().
Stefano Sabatini [Wed, 29 Sep 2010 22:06:44 +0000 (22:06 +0000)]
Set default values for the scale context in sws_alloc_context().

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

9 years agoSet the default value of param0 and param1 to SWS_PARAM_DEFAULT.
Stefano Sabatini [Wed, 29 Sep 2010 22:06:40 +0000 (22:06 +0000)]
Set the default value of param0 and param1 to SWS_PARAM_DEFAULT.

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

9 years agoSet valid default values for the srcw, srch, dstw, dsth options in the
Stefano Sabatini [Wed, 29 Sep 2010 22:06:36 +0000 (22:06 +0000)]
Set valid default values for the srcw, srch, dstw, dsth options in the
scale context. Prevent pointless warnings when using
av_opt_set_defaults() for setting the default values, as in a pending
patch.

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

9 years agoAdd missing case for FF_OPT_TYPE_DOUBLE in av_opt_set_defaults2().
Stefano Sabatini [Wed, 29 Sep 2010 21:42:03 +0000 (21:42 +0000)]
Add missing case for FF_OPT_TYPE_DOUBLE in av_opt_set_defaults2().

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

9 years agoRemove duplicate entries
Baptiste Coudurier [Wed, 29 Sep 2010 21:35:52 +0000 (21:35 +0000)]
Remove duplicate entries

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

9 years agoUse new apple fourcc for mpeg-1 and mpeg-2 in mov, works natively on osx
Baptiste Coudurier [Wed, 29 Sep 2010 21:34:31 +0000 (21:34 +0000)]
Use new apple fourcc for mpeg-1 and mpeg-2 in mov, works natively on osx

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

9 years agoMove static inline function to a macro, so that constant propagation in
Ronald S. Bultje [Wed, 29 Sep 2010 17:42:26 +0000 (17:42 +0000)]
Move static inline function to a macro, so that constant propagation in
inline asm works for gcc-3.x also (hopefully). Should fix gcc-3.x FATE
breakage after r25254.

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

9 years agoCosmetics: put "if (...)" and "av_log(...)" in the same line for
Stefano Sabatini [Wed, 29 Sep 2010 16:15:42 +0000 (16:15 +0000)]
Cosmetics: put "if (...)" and "av_log(...)" in the same line for
improving vertical alignment and readability.

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

9 years agorawdec: Properly pass reordered_opaque through the decoder
Alexander Strange [Wed, 29 Sep 2010 15:43:37 +0000 (15:43 +0000)]
rawdec: Properly pass reordered_opaque through the decoder

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

9 years agoCheck return value of get_chunk_header(). Since enum can be unsigned, the
Ronald S. Bultje [Wed, 29 Sep 2010 15:43:36 +0000 (15:43 +0000)]
Check return value of get_chunk_header(). Since enum can be unsigned, the
current code wouldn't always error out on errors.

Based on patch by Stephen d'Angelo <sdangelo evertz com>.

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

9 years agoUse sse2 variant of put_pixels16() for no_rnd also. Provides a minor speed
Eli Friedman [Wed, 29 Sep 2010 15:34:43 +0000 (15:34 +0000)]
Use sse2 variant of put_pixels16() for no_rnd also. Provides a minor speed
increase to e.g. vc1, snow and mpeg decoding.

Patch by Eli Friedman <eli dot friedman gmail com>.

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

9 years agoAllow setting the impulse block bias for libvorbis through a private codec parameter.
Michael Niedermayer [Wed, 29 Sep 2010 15:09:38 +0000 (15:09 +0000)]
Allow setting the impulse block bias for libvorbis through a private codec parameter.
First example and test of private codec parameters.

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

9 years agoMove allocation and init to defaults of the private codec contexts to avcodec_get_con...
Michael Niedermayer [Wed, 29 Sep 2010 15:05:47 +0000 (15:05 +0000)]
Move allocation and init to defaults of the private codec contexts to avcodec_get_context_defaults3().
That way the user app can set codec specific parameters in the private context
before opening it.

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

9 years agoMerge b_idx and edge variables, and optimize the ASM to directly load variables
Ronald S. Bultje [Wed, 29 Sep 2010 14:04:39 +0000 (14:04 +0000)]
Merge b_idx and edge variables, and optimize the ASM to directly load variables
from memory locations/offsets depending on b_idx plus constants, rather than
having gcc do this. This saves several lea calls and together saves about
10 cycles in h264_loop_filter_strength_mmx2().

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

9 years agoRemove mv_mask variable. Replace the related pand -1/0 instructions by either
Ronald S. Bultje [Wed, 29 Sep 2010 14:03:30 +0000 (14:03 +0000)]
Remove mv_mask variable. Replace the related pand -1/0 instructions by either
a pxor, or remove the instruction alltogether. Altogether, this saves 1
instruction.

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

9 years agoRemove d_idx as a variable, and instead load it as a constant in the asm.
Ronald S. Bultje [Wed, 29 Sep 2010 14:02:32 +0000 (14:02 +0000)]
Remove d_idx as a variable, and instead load it as a constant in the asm.
This has no measurable speed effect because the surrounding code doesn't
take advantage of this yet.

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

9 years agoUnroll inner bidir loop in h264_loop_filter_strength_mmx2(), which gets rid
Ronald S. Bultje [Wed, 29 Sep 2010 13:35:24 +0000 (13:35 +0000)]
Unroll inner bidir loop in h264_loop_filter_strength_mmx2(), which gets rid
of the d_idx variable and therefore allows for future optimizations. No speed
difference by this commit itself.

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

9 years agoUnloop the outer loop in h264_loop_filter_strength_mmx2(), which allows
Ronald S. Bultje [Wed, 29 Sep 2010 13:34:20 +0000 (13:34 +0000)]
Unloop the outer loop in h264_loop_filter_strength_mmx2(), which allows
inlining various constants within the loop code. 20 cycles faster on
cathedral sample.

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

9 years agoPut if (...) av_log() in the same line, more compact and increase
Stefano Sabatini [Wed, 29 Sep 2010 13:02:31 +0000 (13:02 +0000)]
Put if (...) av_log() in the same line, more compact and increase
readibility.

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

9 years agoAmend constraints for the src_format and dst_format options in the
Stefano Sabatini [Wed, 29 Sep 2010 13:02:28 +0000 (13:02 +0000)]
Amend constraints for the src_format and dst_format options in the
SWScale context.

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

9 years agoFix compile on Darwin (FATE). Compile error:
Alexander Strange [Wed, 29 Sep 2010 12:34:01 +0000 (12:34 +0000)]
Fix compile on Darwin (FATE). Compile error:
yadif.c:226: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'
yadif.c:220: error: 'asm' operand has impossible constraints

Patch by Alexander Strange <astrange ithinksw com>.

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

9 years agoAdd AVClass for the private context, this will be used for codec specific options.
Michael Niedermayer [Wed, 29 Sep 2010 11:59:25 +0000 (11:59 +0000)]
Add AVClass for the private context, this will be used for codec specific options.

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

9 years agoCosmetics: fix braces placement.
Stefano Sabatini [Wed, 29 Sep 2010 08:44:09 +0000 (08:44 +0000)]
Cosmetics: fix braces placement.

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

9 years agoDeprecate sws_getContext(), use sws_alloc_context() and
Stefano Sabatini [Tue, 28 Sep 2010 22:23:58 +0000 (22:23 +0000)]
Deprecate sws_getContext(), use sws_alloc_context() and
sws_init_context() instead.

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

9 years agoAdd documentation for the returned value of sws_init_context().
Stefano Sabatini [Tue, 28 Sep 2010 22:23:53 +0000 (22:23 +0000)]
Add documentation for the returned value of sws_init_context().

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

9 years agoAdd APIchanges entry for lsws change of r32368.
Stefano Sabatini [Tue, 28 Sep 2010 15:33:59 +0000 (15:33 +0000)]
Add APIchanges entry for lsws change of r32368.

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

9 years agoBump minor version after the addition of sws_alloc_context() and
Stefano Sabatini [Tue, 28 Sep 2010 15:29:23 +0000 (15:29 +0000)]
Bump minor version after the addition of sws_alloc_context() and
sws_init_context() of r32368.

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

9 years agoMake init() return sensible error code rather than -1 in case of
Stefano Sabatini [Tue, 28 Sep 2010 14:59:09 +0000 (14:59 +0000)]
Make init() return sensible error code rather than -1 in case of
invalid values.

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

9 years agoCosmetics: apply nits.
Stefano Sabatini [Tue, 28 Sep 2010 14:59:06 +0000 (14:59 +0000)]
Cosmetics: apply nits.

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

9 years agoMake new doxy follows the agreed upon style and grammatical
Stefano Sabatini [Tue, 28 Sep 2010 14:49:55 +0000 (14:49 +0000)]
Make new doxy follows the agreed upon style and grammatical
conventions, for consistency with the rest of the documentation.

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

9 years agoGroup togheter filter dependency specifications.
Stefano Sabatini [Tue, 28 Sep 2010 13:44:10 +0000 (13:44 +0000)]
Group togheter filter dependency specifications.

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

9 years agoAdd the drawbox filter from the soc libavfilter repo.
Stefano Sabatini [Tue, 28 Sep 2010 13:16:40 +0000 (13:16 +0000)]
Add the drawbox filter from the soc libavfilter repo.
Pedagogically useful.

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

9 years agoTry to fix crashes introduced by r25218
Jason Garrett-Glaser [Tue, 28 Sep 2010 09:06:22 +0000 (09:06 +0000)]
Try to fix crashes introduced by r25218

r25218 made assumptions about the existence of past reference frames that
weren't necessarily true.

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

9 years agoAll else being equal, prefer PTS over DTS in timestamp correction
Alexander Strange [Tue, 28 Sep 2010 03:45:27 +0000 (03:45 +0000)]
All else being equal, prefer PTS over DTS in timestamp correction

Because DTS values aren't passed through decoders, they tend to be
inaccurate if decoder delay doesn't match what was expected by the encoder.

In particular this improves timestamps for H.264 without num_reorder_frames
set and with -strict 1, which causes DTS to be up to 16 frames ahead of the
picture.

Note that this doesn't really improve any file with very broken PTS/DTS,
since PTS isn't much more accurate in these.

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

9 years agoExtract timestamp correction code from ffplay.c to cmdutils.c
Alexander Strange [Tue, 28 Sep 2010 02:05:12 +0000 (02:05 +0000)]
Extract timestamp correction code from ffplay.c to cmdutils.c

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

9 years agoIn mov demuxer, check that nb_streams is valid before using it in read_dac3
Baptiste Coudurier [Tue, 28 Sep 2010 00:33:21 +0000 (00:33 +0000)]
In mov demuxer, check that nb_streams is valid before using it in read_dac3

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

9 years ago100l fix if condition
Baptiste Coudurier [Mon, 27 Sep 2010 23:47:54 +0000 (23:47 +0000)]
100l fix if condition

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

9 years agoY400A (gray alpha) input support in libswscale
Baptiste Coudurier [Mon, 27 Sep 2010 22:24:03 +0000 (22:24 +0000)]
Y400A (gray alpha) input support in libswscale

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

9 years agoFix index_entries pos:
Michael Chinen [Mon, 27 Sep 2010 22:17:58 +0000 (22:17 +0000)]
Fix index_entries pos:
It was being set wrong for files with data_offset > 0

Patch by Michael Chinen, mchinen gmail

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

9 years agoUpdate APIchanges after r25236.
Stefano Sabatini [Mon, 27 Sep 2010 22:13:18 +0000 (22:13 +0000)]
Update APIchanges after r25236.

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

9 years agoFix out of tree builds with vf_yadif and mmx
Måns Rullgård [Mon, 27 Sep 2010 22:10:39 +0000 (22:10 +0000)]
Fix out of tree builds with vf_yadif and mmx

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

9 years agoMove av_set_options_string() from libavfilter to libavutil.
Stefano Sabatini [Mon, 27 Sep 2010 22:09:53 +0000 (22:09 +0000)]
Move av_set_options_string() from libavfilter to libavutil.

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