ffmpeg.git
8 years agoaudioconvert: make av_get_channel_layout accept composite names.
Nicolas George [Tue, 8 Nov 2011 15:32:50 +0000 (16:32 +0100)]
audioconvert: make av_get_channel_layout accept composite names.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Wed, 9 Nov 2011 19:51:39 +0000 (20:51 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: limit lowres to the maximum supported. Fixes Ticket591

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofraps: check overread per sample instead of per line
Michael Niedermayer [Wed, 9 Nov 2011 18:40:59 +0000 (19:40 +0100)]
fraps: check overread per sample instead of per line

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofraps: fix memleak
Michael Niedermayer [Wed, 9 Nov 2011 18:33:33 +0000 (19:33 +0100)]
fraps: fix memleak

Found-by reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRevert commit 0bc391281ad80d4eb365f3d8978637b07003e8dc
Michael Niedermayer [Wed, 9 Nov 2011 17:58:07 +0000 (18:58 +0100)]
Revert  commit 0bc391281ad80d4eb365f3d8978637b07003e8dc
        ffmpeg: remove -psnr option.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopthreads: drop has_b_frames mangling, its buggy in many many ways,
Michael Niedermayer [Wed, 9 Nov 2011 16:26:19 +0000 (17:26 +0100)]
pthreads: drop has_b_frames mangling, its buggy in many many ways,
not to mention race conditions and that its used for stream copy, used to determine IPB type by
applications and other things.
Fixes various frame drop/timestamp issues with frame multithreading.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoCheck extradata_size before accessing extradata.
Carl Eugen Hoyos [Wed, 9 Nov 2011 13:04:22 +0000 (14:04 +0100)]
Check extradata_size before accessing extradata.

Fixes ticket #627.

8 years agora288: try to fix 10l typo that breaks compile on some platforms
Michael Niedermayer [Wed, 9 Nov 2011 03:53:33 +0000 (04:53 +0100)]
ra288: try to fix 10l typo that breaks compile on some platforms

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoudp: simplify 7a032cb97f743a651138d2da6214c79e0ce089dd
Michael Niedermayer [Wed, 9 Nov 2011 02:51:08 +0000 (03:51 +0100)]
udp: simplify 7a032cb97f743a651138d2da6214c79e0ce089dd

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix segfault on UDP reading
Andrey Utkin [Thu, 3 Nov 2011 07:00:15 +0000 (07:00 +0000)]
Fix segfault on UDP reading

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 9 Nov 2011 01:58:59 +0000 (02:58 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  tls: Use ERR_get_error() in do_tls_poll
  indeo3: Fix a fencepost error.
  mxfdec: Fix comparison of unsigned expression < 0.
  mpegts: set stream id on just created stream, not an unrelated variable
  ra288: return error if input buffer is too small
  ra288: utilize DSPContext.vector_fmul()
  ra288: use memcpy() to copy decoded samples to output
  mace: only calculate output buffer size once
  Remove redundant filename self-references inside files.
  indeo3data: add missing config.h #include for HAVE_BIGENDIAN
  x86: drop pointless ARCH_X86 #ifdef from files in x86 subdirectory
  avplay: reset rdft when closing stream.
  doc/git-howto: expand format-patch and send-email notes.
  lavf: expand doxy for some AVFormatContext fields.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoUse more accurate conversion for rgb15/16 to rgb24/32 (C/MMX).
Themaister [Tue, 8 Nov 2011 15:16:59 +0000 (16:16 +0100)]
Use more accurate conversion for rgb15/16 to rgb24/32 (C/MMX).
Fate update by michael.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofraps: check for overread
Michael Niedermayer [Tue, 8 Nov 2011 21:42:50 +0000 (22:42 +0100)]
fraps: check for overread
Fixeds Ticket619

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegvideo_probe: reduce score for invalid streams
Michael Niedermayer [Tue, 8 Nov 2011 21:24:55 +0000 (22:24 +0100)]
mpegvideo_probe: reduce score for invalid streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffplay: limit lowres to the maximum supported. Fixes Ticket591
Michael Niedermayer [Tue, 8 Nov 2011 02:14:13 +0000 (03:14 +0100)]
ffplay: limit lowres to the maximum supported. Fixes Ticket591

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
8 years agoFix nonsense buffer hints.
Reimar Döffinger [Tue, 8 Nov 2011 20:20:45 +0000 (21:20 +0100)]
Fix nonsense buffer hints.

The codec uses all previous frames as reference frames, so they
certainly must be preserved and readable.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agotls: Use ERR_get_error() in do_tls_poll
Martin Storsjö [Mon, 7 Nov 2011 09:19:17 +0000 (11:19 +0200)]
tls: Use ERR_get_error() in do_tls_poll

The return value ret isn't an error code that can be passed
to ERR_error_string().

This makes the error messages printed actually contain useful
information.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agompegvideo_probe: Getting rid of the use of GCC language extensions
Michael Niedermayer [Tue, 8 Nov 2011 20:11:58 +0000 (21:11 +0100)]
mpegvideo_probe: Getting rid of the use of GCC language extensions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegvideo_probe: dont be too picky on spec compliance and the lack of system startcodes.
Michael Niedermayer [Tue, 8 Nov 2011 19:29:39 +0000 (20:29 +0100)]
mpegvideo_probe: dont be too picky on spec compliance and the lack of system startcodes.
Fixes Ticket620

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegvideo_probe: count video and audio pes seperately
Michael Niedermayer [Tue, 8 Nov 2011 19:29:06 +0000 (20:29 +0100)]
mpegvideo_probe: count video and audio pes seperately

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegvideo probe: fix slice counting
Michael Niedermayer [Tue, 8 Nov 2011 19:27:17 +0000 (20:27 +0100)]
mpegvideo probe: fix slice counting

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoindeo3: Fix a fencepost error.
Alex Converse [Tue, 8 Nov 2011 02:46:46 +0000 (18:46 -0800)]
indeo3: Fix a fencepost error.

Found with asan and the venerable 1-dog.avi sample.

8 years agomxfdec: Fix comparison of unsigned expression < 0.
Alex Converse [Mon, 7 Nov 2011 18:14:54 +0000 (10:14 -0800)]
mxfdec: Fix comparison of unsigned expression < 0.

'size' is populated by functions returning int64_t and int that return
negative error codes.

8 years agompegts: set stream id on just created stream, not an unrelated variable
Anton Khirnov [Tue, 8 Nov 2011 13:13:30 +0000 (14:13 +0100)]
mpegts: set stream id on just created stream, not an unrelated variable

Bug introduced in 84ad31ff180fa089cd6bfd93c246336a16036455.
Thanks to Uoti Urpala for finding it.

8 years agora288: return error if input buffer is too small
Justin Ruggles [Fri, 4 Nov 2011 00:41:17 +0000 (20:41 -0400)]
ra288: return error if input buffer is too small

8 years agora288: utilize DSPContext.vector_fmul()
Justin Ruggles [Sat, 29 Oct 2011 04:42:48 +0000 (00:42 -0400)]
ra288: utilize DSPContext.vector_fmul()

8 years agora288: use memcpy() to copy decoded samples to output
Justin Ruggles [Sat, 29 Oct 2011 04:09:03 +0000 (00:09 -0400)]
ra288: use memcpy() to copy decoded samples to output

8 years agomace: only calculate output buffer size once
Justin Ruggles [Sat, 29 Oct 2011 01:27:36 +0000 (21:27 -0400)]
mace: only calculate output buffer size once

8 years agoRemove redundant filename self-references inside files.
Diego Biurrun [Sun, 30 Oct 2011 21:08:47 +0000 (22:08 +0100)]
Remove redundant filename self-references inside files.

Filenames are brittle across renames and add no useful information.

8 years agoindeo3data: add missing config.h #include for HAVE_BIGENDIAN
Diego Biurrun [Tue, 8 Nov 2011 15:06:50 +0000 (16:06 +0100)]
indeo3data: add missing config.h #include for HAVE_BIGENDIAN

8 years agox86: drop pointless ARCH_X86 #ifdef from files in x86 subdirectory
Diego Biurrun [Tue, 8 Nov 2011 12:46:18 +0000 (13:46 +0100)]
x86: drop pointless ARCH_X86 #ifdef from files in x86 subdirectory

8 years agoflv: Skip invalid index
Michael Niedermayer [Tue, 8 Nov 2011 16:11:02 +0000 (17:11 +0100)]
flv: Skip invalid index

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavplay: reset rdft when closing stream.
Justin Ruggles [Tue, 8 Nov 2011 15:33:18 +0000 (10:33 -0500)]
avplay: reset rdft when closing stream.

this fixes a crash when cycling audio streams if the spectrograph is
displayed.

8 years agoRevert "lavc: Init AVFrame->opaque to AVCodecContext.opaque in avcodec_default_get_bu...
Michael Niedermayer [Tue, 8 Nov 2011 14:24:58 +0000 (15:24 +0100)]
Revert "lavc: Init AVFrame->opaque to AVCodecContext.opaque in avcodec_default_get_buffer()"
This commit causes problems for vlc, see https://trac.videolan.org/vlc/ticket/5518

This reverts commit 475fb67d0b391ad1e8e3e8e3d65d7e6892e17e7a.

8 years agodoc/git-howto: expand format-patch and send-email notes.
Anton Khirnov [Tue, 8 Nov 2011 07:07:51 +0000 (08:07 +0100)]
doc/git-howto: expand format-patch and send-email notes.

8 years agolavf: expand doxy for some AVFormatContext fields.
Anton Khirnov [Sun, 6 Nov 2011 14:16:18 +0000 (15:16 +0100)]
lavf: expand doxy for some AVFormatContext fields.

8 years agoCheck for OOM after av_mallocz() in ff_interleave_add_packet().
Carl Eugen Hoyos [Tue, 8 Nov 2011 09:35:14 +0000 (10:35 +0100)]
Check for OOM after av_mallocz() in ff_interleave_add_packet().

Fixes a crash with the sample from Ubuntu bug #869125.

8 years agoSupport decoding "m1v " mpeg1video in mov.
Carl Eugen Hoyos [Tue, 8 Nov 2011 09:33:21 +0000 (10:33 +0100)]
Support decoding "m1v " mpeg1video in mov.

Fixes ticket #579 at least for ffplay.

8 years agoSupport decoding transport streams from Sony NXCAM.
Carl Eugen Hoyos [Tue, 8 Nov 2011 09:30:37 +0000 (10:30 +0100)]
Support decoding transport streams from Sony NXCAM.

Fixes ticket #617.

8 years agoRevert "Warn the user if lowres > max_lowres, set lowres to max_lowres and continue"
Michael Niedermayer [Tue, 8 Nov 2011 02:19:31 +0000 (03:19 +0100)]
Revert "Warn the user if lowres > max_lowres, set lowres to max_lowres and continue"
Changing the lowres value is risky because the user application may have a
local copy and not read back into it, or not undo some lowres dependant things.
A patch implementing this in ffplay is already on ffmpeg-dev, so this feature
should be back soon.

This reverts commit 125ea3ee06c4d71082bee3fc03c65d7c8c10d68c.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 8 Nov 2011 01:03:14 +0000 (02:03 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avformat: Avoid a warning about mixed declarations and code
  BMV demuxer and decoder
  matroskaenc: Make sure the seekhead struct is freed even on seek failure
  mpeg12enc: Remove write-only variables.
  mpeg12enc: Don't set up run-level info for level 0.
  msmpeg4: Don't set up run-level info for level 0.
  avformat: Warn about using network functions without calling avformat_network_init
  avformat: Revise wording
  rdt: Set AVFMT_NOFILE on ff_rdt_demuxer
  rdt: Check the return value of avformat_open
  rtsp: Discard the dynamic handler, if it has an alloc function which failed
  dsputil: use cpuflags in x86 versions of vector_clip_int32()

Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agov4l2: fix uninitialized variable
Michael Niedermayer [Tue, 8 Nov 2011 00:20:35 +0000 (01:20 +0100)]
v4l2: fix uninitialized variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoflvdec: skip duplicate indexes
Michael Niedermayer [Mon, 7 Nov 2011 23:09:44 +0000 (00:09 +0100)]
flvdec: skip duplicate indexes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavformat: Avoid a warning about mixed declarations and code
Martin Storsjö [Mon, 7 Nov 2011 21:07:39 +0000 (23:07 +0200)]
avformat: Avoid a warning about mixed declarations and code

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoBMV demuxer and decoder
Kostya Shishkov [Tue, 1 Nov 2011 10:58:44 +0000 (11:58 +0100)]
BMV demuxer and decoder

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoproresenc: fix typo that caused the wrong dimensions to be used.
Michael Niedermayer [Mon, 7 Nov 2011 21:13:59 +0000 (22:13 +0100)]
proresenc: fix typo that caused the wrong dimensions to be used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegaudiodec: add SSE-optimized imdct36()
Vitor Sessak [Mon, 7 Nov 2011 20:54:50 +0000 (21:54 +0100)]
mpegaudiodec: add SSE-optimized imdct36()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegaudiodec: move imdct36() to MPADSPContext
Vitor Sessak [Mon, 7 Nov 2011 20:54:49 +0000 (21:54 +0100)]
mpegaudiodec: move imdct36() to MPADSPContext

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibavformat: add support for G726 audio decoder in RTP and RTSP streams
Miroslav Slugeň [Mon, 7 Nov 2011 11:13:55 +0000 (12:13 +0100)]
libavformat: add support for G726 audio decoder in RTP and RTSP streams
Fixes Ticket611

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibutvideodec: Check if the decode initializes correctly
Derek Buitenhuis [Mon, 7 Nov 2011 17:02:30 +0000 (12:02 -0500)]
libutvideodec: Check if the decode initializes correctly

Actually check the return value of DecodeBegin, to make
sure that it has encountered no errors.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibutvideodec: Remove CODEC_CAP_LOSSLESS
Derek Buitenhuis [Mon, 7 Nov 2011 17:00:59 +0000 (12:00 -0500)]
libutvideodec: Remove CODEC_CAP_LOSSLESS

Remove the CODEC_CAP_LOSSLESS flag, as it doesn't make
any sense for a decoder to use it.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibutvideodec: Make buf_size local
Derek Buitenhuis [Mon, 7 Nov 2011 16:51:47 +0000 (11:51 -0500)]
libutvideodec: Make buf_size local

Since buf_size is only used in this one function, there
is no reason for it to be part of UtVideoContext.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomatroskaenc: Make sure the seekhead struct is freed even on seek failure
Martin Storsjö [Mon, 7 Nov 2011 19:06:01 +0000 (21:06 +0200)]
matroskaenc: Make sure the seekhead struct is freed even on seek failure

The caller expects the seekhead struct to be freed when calling
matroska_write_seekhead. Currently, the structure is leaked if the
seek fails.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agompeg12enc: Remove write-only variables.
Alex Converse [Thu, 3 Nov 2011 23:02:17 +0000 (16:02 -0700)]
mpeg12enc: Remove write-only variables.

8 years agompeg12enc: Don't set up run-level info for level 0.
Alex Converse [Thu, 3 Nov 2011 22:56:37 +0000 (15:56 -0700)]
mpeg12enc: Don't set up run-level info for level 0.

run: The number of zero coefficients preceding a non-zero coefficient,
in the scan order. The absolute value of the non-zero coefficient is
called "level".

The run-level code makes illegal reads when trying to set up tables for
nonsense level 0.

8 years agomsmpeg4: Don't set up run-level info for level 0.
Alex Converse [Thu, 3 Nov 2011 22:57:23 +0000 (15:57 -0700)]
msmpeg4: Don't set up run-level info for level 0.

run: The number of zero coefficients preceding a non-zero coefficient,
in the scan order. The absolute value of the non-zero coefficient is
called "level".

The run-level code makes illegal reads when trying to set up tables for
nonsense level 0.

8 years agolibutvideodec: Fix typo
Derek Buitenhuis [Mon, 7 Nov 2011 17:20:29 +0000 (12:20 -0500)]
libutvideodec: Fix typo

Remove extraneous space.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibutvideodec: Width and height don't need to be unsigned
Derek Buitenhuis [Mon, 7 Nov 2011 17:20:26 +0000 (12:20 -0500)]
libutvideodec: Width and height don't need to be unsigned

Width and height, as used in utvideo_decode_frame, do not
need to be unsigned, and it could cause sign-compare
warnings later on.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibutvideodec: Fix name of extradata member
Derek Buitenhuis [Mon, 7 Nov 2011 17:20:22 +0000 (12:20 -0500)]
libutvideodec: Fix name of extradata member

The frameinfo size member of the Ut Video extradata
was erroneously thought to be the number of stripes.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavformat: Warn about using network functions without calling avformat_network_init
Martin Storsjö [Mon, 7 Nov 2011 11:57:33 +0000 (13:57 +0200)]
avformat: Warn about using network functions without calling avformat_network_init

This is to make developers aware of the fact that they will
start using the new init function at some point.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoavformat: Revise wording
Martin Storsjö [Mon, 7 Nov 2011 12:09:06 +0000 (14:09 +0200)]
avformat: Revise wording

It might make sense not to make the function completely mandatory
immediately at the next bump, which might be quite soon after
the function was introduced.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agofate: add --timeout=60 --contimeout=60 to fate-rsync
Michael Niedermayer [Mon, 7 Nov 2011 14:12:45 +0000 (15:12 +0100)]
fate: add --timeout=60 --contimeout=60 to fate-rsync

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibutvideodec: remove impossible pix_fmt case
Derek Buitenhuis [Mon, 7 Nov 2011 13:29:26 +0000 (14:29 +0100)]
libutvideodec: remove impossible pix_fmt case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibutvideo: Don't try and output original_format
Derek Buitenhuis [Mon, 7 Nov 2011 04:51:47 +0000 (23:51 -0500)]
libutvideo: Don't try and output original_format

The original format field in Ut Video's extradata
should not be used to determine the output format.
Cases can occur where the original format differs
from the actual current format, and thus should
not be used as the output format. Instead, rely
solely on the FOURCC.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffprobe: refactor value_string() to accept an unit_value struct
Stefano Sabatini [Mon, 24 Oct 2011 00:31:17 +0000 (02:31 +0200)]
ffprobe: refactor value_string() to accept an unit_value struct

The new design allows to specialize the format for continuos time values
and discrete values. In particular, allows to print integer values like
"12" rather than "12.000".

Prettify, simplify parsing for integer values.

8 years agoffprobe: introduce print_val() macro, ease readability
Stefano Sabatini [Sun, 6 Nov 2011 12:49:08 +0000 (13:49 +0100)]
ffprobe: introduce print_val() macro, ease readability

8 years agoffprobe: implement and use print_time and print_ts macros
Stefano Sabatini [Sun, 6 Nov 2011 11:38:58 +0000 (12:38 +0100)]
ffprobe: implement and use print_time and print_ts macros

Help readability.

8 years agordt: Set AVFMT_NOFILE on ff_rdt_demuxer
Martin Storsjö [Sun, 6 Nov 2011 22:25:03 +0000 (00:25 +0200)]
rdt: Set AVFMT_NOFILE on ff_rdt_demuxer

This makes rdt work again, which has been broken since
603b8bc2a109978c8499b06d2556f1433306eca7. This commit made
opening a demuxer without a file (or in this case, with a filename
which can't be opened) fail, unless the demuxer actually declared
AVFMT_NOFILE.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agordt: Check the return value of avformat_open
Martin Storsjö [Sun, 6 Nov 2011 21:51:19 +0000 (23:51 +0200)]
rdt: Check the return value of avformat_open

If it failed, return NULL. This avoids trying to use an
half-initialized RDTDemuxContext.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortsp: Discard the dynamic handler, if it has an alloc function which failed
Martin Storsjö [Sun, 6 Nov 2011 21:50:39 +0000 (23:50 +0200)]
rtsp: Discard the dynamic handler, if it has an alloc function which failed

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoavio: print a warning from ffurl_alloc() if no protocols are allocated.
Michael Niedermayer [Mon, 7 Nov 2011 03:18:53 +0000 (04:18 +0100)]
avio: print a warning from ffurl_alloc() if no protocols are allocated.
Fixes Ticket618

Based on code by teratorn
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 7 Nov 2011 01:41:01 +0000 (02:41 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (23 commits)
  x86inc: use sse versions of common macros instead of sse2 when applicable
  doc/APIchanges: add missing dates and hashes
  lavf: don't return from void av_update_cur_dts()
  Changelog: add more entries.
  Changelog: update ffmpeg/avconv incompatibility list.
  avconv: remove some redundant temporary variables.
  avconv: fix broken indentation
  avconv: move copy_initial_nonkeyframes to the options context.
  avconv: use file:stream instead of file.stream in log messages.
  doc/avconv: elaborate on basic functionality.
  doc/avconv: -sample_fmts, not -help sample_fmts prints the sample formats
  openssl: Only use CRYPTO_set_id_callback on OpenSSL < 1.0.0
  Call avformat_network_init/deinit in the programs
  Remove leftover includes of strings.h
  avutil: Don't allow using strcasecmp/strncasecmp
  Replace all usage of strcasecmp/strncasecmp
  avstring: Add locale independent implementations of strcasecmp/strncasecmp
  avstring: Add locale independent implementations of toupper/tolower
  cosmetics: insert some spaces in explicit enum value assignments
  move 8SVX audio codecs to the audio codec list part on the next bump
  ...

Conflicts:
avprobe.c
doc/APIchanges
ffplay.c
ffserver.c
libavcodec/avcodec.h
libavdevice/bktr.c
libavdevice/v4l.c
libavdevice/v4l2.c
libavformat/matroskaenc.c
libavformat/wtv.c
libavutil/avstring.c
libavutil/avstring.h
libavutil/avutil.h
libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodsputil: use cpuflags in x86 versions of vector_clip_int32()
Justin Ruggles [Sun, 6 Nov 2011 20:27:55 +0000 (15:27 -0500)]
dsputil: use cpuflags in x86 versions of vector_clip_int32()

8 years agoaudioconvert: prefer 5.X over 5.X(side).
Nicolas George [Sun, 6 Nov 2011 16:05:08 +0000 (17:05 +0100)]
audioconvert: prefer 5.X over 5.X(side).
This is the logical consequence of commit ab539d9e:
5.X(back) is more common than 5.X(side).

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agox86inc: use sse versions of common macros instead of sse2 when applicable
Justin Ruggles [Sun, 6 Nov 2011 19:22:42 +0000 (14:22 -0500)]
x86inc: use sse versions of common macros instead of sse2 when applicable

8 years agodoc/APIchanges: add missing dates and hashes
Anton Khirnov [Sun, 6 Nov 2011 19:33:13 +0000 (20:33 +0100)]
doc/APIchanges: add missing dates and hashes

8 years agolavf: don't return from void av_update_cur_dts()
Anton Khirnov [Sun, 6 Nov 2011 18:13:28 +0000 (19:13 +0100)]
lavf: don't return from void av_update_cur_dts()

8 years agoChangelog: add more entries.
Anton Khirnov [Sun, 6 Nov 2011 13:22:22 +0000 (14:22 +0100)]
Changelog: add more entries.

8 years agoChangelog: update ffmpeg/avconv incompatibility list.
Anton Khirnov [Sun, 6 Nov 2011 13:05:46 +0000 (14:05 +0100)]
Changelog: update ffmpeg/avconv incompatibility list.

8 years agoavconv: remove some redundant temporary variables.
Anton Khirnov [Sun, 6 Nov 2011 09:32:44 +0000 (10:32 +0100)]
avconv: remove some redundant temporary variables.

8 years agoavconv: fix broken indentation
Anton Khirnov [Sun, 6 Nov 2011 09:27:43 +0000 (10:27 +0100)]
avconv: fix broken indentation

8 years agoavconv: move copy_initial_nonkeyframes to the options context.
Anton Khirnov [Sun, 6 Nov 2011 09:26:56 +0000 (10:26 +0100)]
avconv: move copy_initial_nonkeyframes to the options context.

Also document it.

8 years agoavconv: use file:stream instead of file.stream in log messages.
Anton Khirnov [Sun, 6 Nov 2011 12:00:13 +0000 (13:00 +0100)]
avconv: use file:stream instead of file.stream in log messages.

8 years agodoc/avconv: elaborate on basic functionality.
Anton Khirnov [Sat, 5 Nov 2011 15:23:23 +0000 (16:23 +0100)]
doc/avconv: elaborate on basic functionality.

8 years agodoc/avconv: -sample_fmts, not -help sample_fmts prints the sample formats
Anton Khirnov [Sat, 5 Nov 2011 14:55:25 +0000 (15:55 +0100)]
doc/avconv: -sample_fmts, not -help sample_fmts prints the sample formats

8 years agoopenssl: Only use CRYPTO_set_id_callback on OpenSSL < 1.0.0
Martin Storsjö [Sat, 5 Nov 2011 23:50:03 +0000 (01:50 +0200)]
openssl: Only use CRYPTO_set_id_callback on OpenSSL < 1.0.0

Since 1.0.0, this function is deprecated. A new function,
CRYPTO_THREADID_set_callback is available, but if not set at all,
it uses the address of errno as thread id, which should be
sufficient for most systems.

On windows, it never was necessary to use this function even
before 1.0.0, it used the right win32 API function for this
by default.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoCall avformat_network_init/deinit in the programs
Martin Storsjö [Sun, 6 Nov 2011 00:47:48 +0000 (02:47 +0200)]
Call avformat_network_init/deinit in the programs

Calling the init function will become mandatory at some later
point. By calling it, more heavy network init (such as SSL/TLS
library init) can be done once at startup, instead of implicitly
when used (which could lead to it being done a number of times).

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agodshow: support BI_BITFIELDS compression type
Ramiro Polla [Sat, 8 Oct 2011 18:00:00 +0000 (15:00 -0300)]
dshow: support BI_BITFIELDS compression type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: use isByteRGB() to simplify check for palToRgbWrapper.
Michael Niedermayer [Sun, 6 Nov 2011 12:30:10 +0000 (13:30 +0100)]
swscale: use isByteRGB() to simplify check for palToRgbWrapper.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: Fix packed rgb check for planarRgbToRgbWrapper.
Michael Niedermayer [Sun, 6 Nov 2011 12:26:50 +0000 (13:26 +0100)]
swscale: Fix packed rgb check for planarRgbToRgbWrapper.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoUnscaled Planar RGB -> RGB support in swscale.
Themaister [Sun, 6 Nov 2011 09:43:47 +0000 (10:43 +0100)]
Unscaled Planar RGB -> RGB support in swscale.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaf_aconvert: fix doc reference to unexisting chlayout.h file
Stefano Sabatini [Sun, 6 Nov 2011 10:46:57 +0000 (11:46 +0100)]
af_aconvert: fix doc reference to unexisting chlayout.h file

8 years agoRemove leftover includes of strings.h
Martin Storsjö [Fri, 4 Nov 2011 13:08:49 +0000 (15:08 +0200)]
Remove leftover includes of strings.h

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoavutil: Don't allow using strcasecmp/strncasecmp
Reimar Döffinger [Sat, 5 Nov 2011 15:21:04 +0000 (17:21 +0200)]
avutil: Don't allow using strcasecmp/strncasecmp

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoReplace all usage of strcasecmp/strncasecmp
Reimar Döffinger [Wed, 2 Nov 2011 19:17:25 +0000 (20:17 +0100)]
Replace all usage of strcasecmp/strncasecmp

All current usages of it are incompatible with localization.
For example strcasecmp("i", "I") != 0 is possible, but would
break many of the places where it is used.

Instead use our own implementations that always treat the data
as ASCII.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoavstring: Add locale independent implementations of strcasecmp/strncasecmp
Reimar Döffinger [Sat, 5 Nov 2011 15:20:41 +0000 (17:20 +0200)]
avstring: Add locale independent implementations of strcasecmp/strncasecmp

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoavstring: Add locale independent implementations of toupper/tolower
Luca Barbato [Sat, 5 Nov 2011 15:15:43 +0000 (17:15 +0200)]
avstring: Add locale independent implementations of toupper/tolower

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoFix av_packet_split_side_data.
Reimar Döffinger [Sun, 6 Nov 2011 00:33:31 +0000 (01:33 +0100)]
Fix av_packet_split_side_data.

p cannot be calculated before av_dup_packet since that one
might change avpkt->data, causing invalid reads and a
non-working range check.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agocosmetics: insert some spaces in explicit enum value assignments
Kostya Shishkov [Sat, 5 Nov 2011 13:34:23 +0000 (14:34 +0100)]
cosmetics: insert some spaces in explicit enum value assignments

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agomove 8SVX audio codecs to the audio codec list part on the next bump
Kostya Shishkov [Sat, 5 Nov 2011 13:34:08 +0000 (14:34 +0100)]
move 8SVX audio codecs to the audio codec list part on the next bump

Signed-off-by: Anton Khirnov <anton@khirnov.net>