ffmpeg.git
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 17 Aug 2012 15:06:07 +0000 (17:06 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libvpxenc: use the default bitrate if not set
  utvideo: Rename utvideo.c to utvideodec.c
  doc: Fix syntax errors in sample Emacs config
  mjpegdec: more meaningful return values
  configure: clean up Altivec detection
  getopt: Remove an unnecessary define
  rtmp: Use int instead of ssize_t
  getopt: Add missing includes
  rtmp: Add support for receiving incoming streams
  Add missing includes for code relying on external libraries

Conflicts:
libavcodec/libopenjpegenc.c
libavcodec/libvpxenc.c
libavcodec/mjpegdec.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibvpxenc: use the default bitrate if not set
Luca Barbato [Thu, 16 Aug 2012 18:00:53 +0000 (20:00 +0200)]
libvpxenc: use the default bitrate if not set

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoutvideo: Rename utvideo.c to utvideodec.c
Jan Ekström [Fri, 17 Aug 2012 10:33:52 +0000 (13:33 +0300)]
utvideo: Rename utvideo.c to utvideodec.c

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
6 years agodoc: Fix syntax errors in sample Emacs config
Jordi Ortiz [Wed, 15 Aug 2012 15:58:01 +0000 (17:58 +0200)]
doc: Fix syntax errors in sample Emacs config

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agolavfi/edgedetect: add rounding for high/low threshold.
Clément Bœsch [Fri, 17 Aug 2012 06:07:37 +0000 (08:07 +0200)]
lavfi/edgedetect: add rounding for high/low threshold.

This should fix the 32-bit FATE instances where low_u8=19 and high_u8=49.

6 years agoescape124: Fix long == 64 assumtation.
Michael Niedermayer [Fri, 17 Aug 2012 05:16:16 +0000 (07:16 +0200)]
escape124: Fix long == 64 assumtation.

Found-by: Nicolas
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoccitt fax: fix some group3 1d files without EOL
Michael Niedermayer [Fri, 17 Aug 2012 00:58:41 +0000 (02:58 +0200)]
ccitt fax: fix some group3 1d files without EOL

Fixes Ticket832

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomjpegdec: more meaningful return values
Luca Barbato [Thu, 16 Aug 2012 21:24:15 +0000 (23:24 +0200)]
mjpegdec: more meaningful return values

6 years agoconfigure: clean up Altivec detection
Mans Rullgard [Wed, 15 Aug 2012 23:10:33 +0000 (00:10 +0100)]
configure: clean up Altivec detection

There used to be one test for Altivec intrinsics support and a
separate test to determine which of two possible syntaxes to use
for vector literals.  Since 2008, we only support the more common
of these so the split test no longer makes sense.

This combines the tests into one and also changes the hard error on
failure to a warning.  The test can reasonably fail if no --cpu flag
is provided (or is provided with an unknown CPU) and the compiler
default target does not support Altivec.  Aborting in this case is
probably over-reacting.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoescape124: fix integer overflow leading to excessive memory allocation
Michael Niedermayer [Thu, 16 Aug 2012 20:28:29 +0000 (22:28 +0200)]
escape124: fix integer overflow leading to excessive memory allocation

Fixes Ticket1629

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agogetopt: Remove an unnecessary define
Martin Storsjö [Thu, 16 Aug 2012 19:14:52 +0000 (22:14 +0300)]
getopt: Remove an unnecessary define

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agodeprecate av_parse_cpu_flags
Michael Niedermayer [Thu, 16 Aug 2012 19:30:10 +0000 (21:30 +0200)]
deprecate av_parse_cpu_flags

This function is problematic in several ways, its also quite
unpredictable which flags it ends up turning on

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoav_parse_cpu_caps: add "mmxext" as alias for mmx2
Michael Niedermayer [Thu, 16 Aug 2012 19:28:31 +0000 (21:28 +0200)]
av_parse_cpu_caps: add "mmxext" as alias for mmx2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofft-test: switch to new cpu flags API
Michael Niedermayer [Thu, 16 Aug 2012 19:28:05 +0000 (21:28 +0200)]
fft-test: switch to new cpu flags API

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: add edgedetect filter.
Clément Bœsch [Thu, 26 Jul 2012 17:45:53 +0000 (19:45 +0200)]
lavfi: add edgedetect filter.

6 years agortmp: Use int instead of ssize_t
Martin Storsjö [Thu, 16 Aug 2012 19:11:13 +0000 (22:11 +0300)]
rtmp: Use int instead of ssize_t

Not all compilers support ssize_t (MSVC doesn't), and none of these
variables need to be larger than 32 bit.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agogetopt: Add missing includes
Martin Storsjö [Thu, 16 Aug 2012 12:04:27 +0000 (15:04 +0300)]
getopt: Add missing includes

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavfi/movie: extend a doxygen comment.
Nicolas George [Thu, 16 Aug 2012 16:17:29 +0000 (18:17 +0200)]
lavfi/movie: extend a doxygen comment.

6 years agolibswscale: fix #endif comments in rgb2rgb_template.c
Giorgio Vazzana [Thu, 16 Aug 2012 12:35:41 +0000 (14:35 +0200)]
libswscale: fix #endif comments in rgb2rgb_template.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/movie: set pkt->stream_index for flushing.
Nicolas George [Tue, 14 Aug 2012 09:08:48 +0000 (11:08 +0200)]
lavfi/movie: set pkt->stream_index for flushing.

Otherwise, the value of stream_index is kept from the last packet
read, which is not necessarily the stream that needs flushing.

6 years agovc1dsp_mmx: remove libavutil/internal.h include
Michael Niedermayer [Thu, 16 Aug 2012 15:29:29 +0000 (17:29 +0200)]
vc1dsp_mmx: remove libavutil/internal.h include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosimple_idct_mmx: remove libavutil/internal.h include
Michael Niedermayer [Thu, 16 Aug 2012 15:28:57 +0000 (17:28 +0200)]
simple_idct_mmx: remove libavutil/internal.h include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/motion_est_mmx: remove libavutil/internal.h include
Michael Niedermayer [Thu, 16 Aug 2012 15:28:37 +0000 (17:28 +0200)]
x86/motion_est_mmx: remove libavutil/internal.h include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/mlpdsp: remove libavutil/internal.h include
Michael Niedermayer [Thu, 16 Aug 2012 15:28:13 +0000 (17:28 +0200)]
x86/mlpdsp: remove libavutil/internal.h include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoyadif: remove libavutil/internal.h include
Michael Niedermayer [Thu, 16 Aug 2012 15:27:55 +0000 (17:27 +0200)]
yadif: remove libavutil/internal.h include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolpc_mmx: remove libavutil/internal.h include
Michael Niedermayer [Thu, 16 Aug 2012 15:26:41 +0000 (17:26 +0200)]
lpc_mmx: remove libavutil/internal.h include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoidct_sse2_xvid: remove libavutil/internal.h include
Michael Niedermayer [Thu, 16 Aug 2012 15:26:06 +0000 (17:26 +0200)]
idct_sse2_xvid: remove libavutil/internal.h include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortmp: Add support for receiving incoming streams
Jordi Ortiz [Thu, 16 Aug 2012 14:04:48 +0000 (16:04 +0200)]
rtmp: Add support for receiving incoming streams

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolibvpxenc: check for odd RC parameter combinations that could crash
Michael Niedermayer [Thu, 16 Aug 2012 14:59:42 +0000 (16:59 +0200)]
libvpxenc: check for odd RC parameter combinations that could crash

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibvpxenc: fix division by zero
Michael Niedermayer [Thu, 16 Aug 2012 14:58:59 +0000 (16:58 +0200)]
libvpxenc: fix division by zero

Reported-by: thresh
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 16 Aug 2012 14:12:45 +0000 (16:12 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Fix even more missing includes after the common.h removal
  build: Factor out rangecoder dependencies to CONFIG_RANGECODER
  build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE
  x86: avcodec: Consistently name all init files
  Add more missing includes after removing the implicit common.h
  Add some more missing includes after removing the implicit common.h
  Don't include common.h from avutil.h
  rtmp: Automatically compute the hash for SWFVerification

Conflicts:
configure
doc/APIchanges
doc/examples/decoding_encoding.c
libavcodec/Makefile
libavcodec/assdec.c
libavcodec/audio_frame_queue.c
libavcodec/avpacket.c
libavcodec/dv_profile.c
libavcodec/dwt.c
libavcodec/libtheoraenc.c
libavcodec/rawdec.c
libavcodec/rv40dsp.c
libavcodec/tiff.c
libavcodec/tiffenc.c
libavcodec/v210dec.h
libavcodec/vc1dsp.c
libavcodec/x86/Makefile
libavfilter/asrc_anullsrc.c
libavfilter/avfilter.c
libavfilter/buffer.c
libavfilter/formats.c
libavfilter/vf_ass.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_select.c
libavfilter/video.c
libavfilter/vsrc_testsrc.c
libavformat/version.h
libavutil/audioconvert.c
libavutil/error.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd missing includes for code relying on external libraries
Martin Storsjö [Thu, 16 Aug 2012 11:24:26 +0000 (14:24 +0300)]
Add missing includes for code relying on external libraries

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavfi/hue: add verbose debug message showing initial parameters
Stefano Sabatini [Thu, 16 Aug 2012 12:57:56 +0000 (14:57 +0200)]
lavfi/hue: add verbose debug message showing initial parameters

6 years agolavfi/hue: reindent after previous commits
Stefano Sabatini [Thu, 16 Aug 2012 12:51:33 +0000 (14:51 +0200)]
lavfi/hue: reindent after previous commits

6 years agolavfi/hue: apply misc fixes to default values setting
Stefano Sabatini [Thu, 16 Aug 2012 12:48:54 +0000 (14:48 +0200)]
lavfi/hue: apply misc fixes to default values setting

In particular: signal error in case of bogus h:s values.

6 years agolavfi/hue: add named options support
Jérémy Tran [Thu, 16 Aug 2012 07:15:58 +0000 (09:15 +0200)]
lavfi/hue: add named options support

Old syntax has been kept for compatibility reasons.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolavfi/mp: remove hue wrapped filter
Stefano Sabatini [Tue, 14 Aug 2012 19:34:01 +0000 (21:34 +0200)]
lavfi/mp: remove hue wrapped filter

hue was integrated as a native libavfilter filter.

6 years agoFix even more missing includes after the common.h removal
Martin Storsjö [Thu, 16 Aug 2012 11:02:24 +0000 (14:02 +0300)]
Fix even more missing includes after the common.h removal

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agobuild: Factor out rangecoder dependencies to CONFIG_RANGECODER
Diego Biurrun [Mon, 13 Aug 2012 17:16:06 +0000 (19:16 +0200)]
build: Factor out rangecoder dependencies to CONFIG_RANGECODER

A new hidden config variable is added for the codecs that depend on
the rangecoder parts.

6 years agobuild: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE
Diego Biurrun [Mon, 13 Aug 2012 17:13:32 +0000 (19:13 +0200)]
build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE

A new hidden config variable is added for the codecs that depend on
the error resilience parts.

6 years agox86: avcodec: Consistently name all init files
Diego Biurrun [Sat, 11 Aug 2012 21:07:27 +0000 (23:07 +0200)]
x86: avcodec: Consistently name all init files

6 years agoSupport reading 16-channel lxf files.
Carl Eugen Hoyos [Thu, 16 Aug 2012 08:20:25 +0000 (10:20 +0200)]
Support reading 16-channel lxf files.

Fixes ticket #1608.

Reported, analyzed and tested by Gabriel Gerard.

6 years agoAdd more missing includes after removing the implicit common.h
Martin Storsjö [Thu, 16 Aug 2012 07:22:31 +0000 (10:22 +0300)]
Add more missing includes after removing the implicit common.h

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomovtextdec: Don't emit errors for normal duration-end packets.
Philip Langdale [Sun, 12 Aug 2012 21:16:35 +0000 (14:16 -0700)]
movtextdec: Don't emit errors for normal duration-end packets.

The logic here was off. If the packet size is exactly two, then
it's a well-formed empty subtitle, used to mark the end of the
duration of the previous subtitle.

Signed-off-by: Philip Langdale <philipl@overt.org>
6 years agosrtenc: Add timing-less "subrip" encoder.
Philip Langdale [Sun, 12 Aug 2012 21:18:35 +0000 (14:18 -0700)]
srtenc: Add timing-less "subrip" encoder.

Unsurprisingly, if a timing-less subrip decoder is desireable, an
encoder is as well. With this in place, we can move on to remove
the use of the old encoder/decoder with embedded timing and move
all timing handling the (de)muxer where they belong.

Signed-off-by: Philip Langdale <philipl@overt.org>
6 years agosrtdec: Add timing-less "subrip" decoder.
Philip Langdale [Sun, 12 Aug 2012 03:27:51 +0000 (20:27 -0700)]
srtdec: Add timing-less "subrip" decoder.

After various discussions, we concluded that, amongst other things,
it made sense to have a separate subrip decoder that did not use
in-band timing information, and rather relied on the ffmpeg level
timing.

As this is 90% the same as the existing srt decoder, it's implemented
in the same file.

Signed-off-by: Philip Langdale <philipl@overt.org>
6 years agolavf: minor bump for avformat_queue_attached_pictures()
Michael Niedermayer [Thu, 16 Aug 2012 02:57:08 +0000 (04:57 +0200)]
lavf: minor bump for avformat_queue_attached_pictures()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoLICENSE: correct incorrect claims on *GPL incompatibility
Michael Niedermayer [Mon, 13 Aug 2012 16:45:33 +0000 (18:45 +0200)]
LICENSE: correct incorrect claims on *GPL incompatibility

There are currently no statements from any person qualified in the art
of law about the LGPL compatibility of the libfaac license and others.
Furthermore their is no consensus about their compatibility amongth
people not qualified in the art.

Also of interrest may be that ubuntu distributes and links libfaac
to LGPL code. And the ubuntu technical comittee decision about libfaac
https://lists.ubuntu.com/archives/technical-board/2011-February/000703.html

Comments and other viewpoints, especially if i have missed something
are very welcome!

Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: reque attached pictures on channel changes.
Michael Niedermayer [Tue, 14 Aug 2012 00:02:08 +0000 (02:02 +0200)]
ffplay: reque attached pictures on channel changes.

Fixes Ticket1473

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: export queue_attached_pictures
Michael Niedermayer [Tue, 14 Aug 2012 00:01:38 +0000 (02:01 +0200)]
avformat: export queue_attached_pictures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodv: fix null ptr dereference
Michael Niedermayer [Thu, 16 Aug 2012 02:25:07 +0000 (04:25 +0200)]
dv: fix null ptr dereference

Fixes Ticket1640

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosp5xdec: fix off by 1 error causing a crash
Michael Niedermayer [Thu, 16 Aug 2012 01:15:14 +0000 (03:15 +0200)]
sp5xdec: fix off by 1 error causing a crash

Fixes Ticket1633

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoav_get_audio_frame_duration: fix ra144
Michael Niedermayer [Thu, 16 Aug 2012 00:57:11 +0000 (02:57 +0200)]
av_get_audio_frame_duration: fix ra144

Fixes Ticket1612

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosnowdec: add 2 av_asserts to check run validity
Michael Niedermayer [Wed, 15 Aug 2012 23:35:10 +0000 (01:35 +0200)]
snowdec: add 2 av_asserts to check run validity

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosnowdec: check log in get_symbol2()
Michael Niedermayer [Wed, 15 Aug 2012 23:31:19 +0000 (01:31 +0200)]
snowdec: check log in get_symbol2()

Fixes Ticket1635

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd some more missing includes after removing the implicit common.h
Martin Storsjö [Wed, 15 Aug 2012 20:27:52 +0000 (23:27 +0300)]
Add some more missing includes after removing the implicit common.h

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agompegvideo: dont call draw edges on lowres
Michael Niedermayer [Wed, 15 Aug 2012 20:33:55 +0000 (22:33 +0200)]
mpegvideo: dont call draw edges on lowres

this crashes otherwise, and can happen from try_decode_frame() in the case of decoding errors
Fixes Ticket1602

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh263penc: fix multitheraded encoding
Michael Niedermayer [Wed, 15 Aug 2012 20:14:24 +0000 (22:14 +0200)]
h263penc: fix multitheraded encoding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo_enc: reset mb_x/y before writing the headers
Michael Niedermayer [Wed, 15 Aug 2012 20:09:56 +0000 (22:09 +0200)]
mpegvideo_enc: reset mb_x/y before writing the headers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomotion_est: switch some asserts to av_assert
Michael Niedermayer [Wed, 15 Aug 2012 19:39:53 +0000 (21:39 +0200)]
motion_est: switch some asserts to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoDon't include common.h from avutil.h
Martin Storsjö [Mon, 6 Aug 2012 13:49:32 +0000 (16:49 +0300)]
Don't include common.h from avutil.h

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortmp: Automatically compute the hash for SWFVerification
Samuel Pitoiset [Wed, 15 Aug 2012 14:11:50 +0000 (16:11 +0200)]
rtmp: Automatically compute the hash for SWFVerification

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 15 Aug 2012 13:41:01 +0000 (15:41 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: Add support for SWFVerification
  api-example: use new video encoding API.
  x86: avcodec: Appropriately name files containing only init functions
  mpegvideo_mmx_template: drop some commented-out cruft
  libavresample: add mix level normalization option
  w32pthreads: Add missing #includes to make header compile standalone
  rtmp: Gracefully ignore _checkbw errors by tracking them
  rtmp: Do not send _checkbw calls as notifications
  prores: interlaced ProRes encoding

Conflicts:
doc/examples/decoding_encoding.c
libavcodec/proresenc_kostya.c
libavcodec/w32pthreads.h
libavcodec/x86/Makefile
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortmp: Add support for SWFVerification
Samuel Pitoiset [Mon, 13 Aug 2012 15:05:00 +0000 (17:05 +0200)]
rtmp: Add support for SWFVerification

Specifies how the server verifies client SWF files before allowing the
files to connect to an application. Verifying SWF files is a security
measure that prevents someone from creating their own SWF files that can
attempt to stream your resources.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoapi-example: use new video encoding API.
Anton Khirnov [Tue, 31 Jul 2012 14:35:18 +0000 (16:35 +0200)]
api-example: use new video encoding API.

6 years agomsmpeg4v2: initialize mb_type array
Michael Niedermayer [Wed, 15 Aug 2012 03:29:28 +0000 (05:29 +0200)]
msmpeg4v2: initialize mb_type array

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo: fix MB/MV vissualization on videos that are not mod 16 == 0
Michael Niedermayer [Wed, 15 Aug 2012 03:03:37 +0000 (05:03 +0200)]
mpegvideo: fix MB/MV vissualization on videos that are not mod 16 == 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: avcodec: Appropriately name files containing only init functions
Diego Biurrun [Sat, 11 Aug 2012 20:45:53 +0000 (22:45 +0200)]
x86: avcodec: Appropriately name files containing only init functions

6 years agompegvideo_mmx_template: drop some commented-out cruft
Diego Biurrun [Mon, 13 Aug 2012 10:28:59 +0000 (12:28 +0200)]
mpegvideo_mmx_template: drop some commented-out cruft

6 years agomovdec: Try to recover from overreading atoms
Michael Niedermayer [Wed, 15 Aug 2012 01:21:19 +0000 (03:21 +0200)]
movdec: Try to recover from overreading atoms

Fixes Ticket1596

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopafdec: fix wrong check for input buffer size.
Michael Niedermayer [Tue, 14 Aug 2012 23:58:41 +0000 (01:58 +0200)]
pafdec: fix wrong check for input buffer size.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopafdec: fix wrong palette index check.
Michael Niedermayer [Tue, 14 Aug 2012 23:57:45 +0000 (01:57 +0200)]
pafdec: fix wrong palette index check.

Fixes Ticket1641

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavresample: add mix level normalization option
John Stebbins [Thu, 2 Aug 2012 18:23:06 +0000 (11:23 -0700)]
libavresample: add mix level normalization option

Provides an option to disable mix level normalization

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agow32pthreads: Add missing #includes to make header compile standalone
Diego Biurrun [Tue, 14 Aug 2012 21:17:20 +0000 (23:17 +0200)]
w32pthreads: Add missing #includes to make header compile standalone

6 years agortmp: Gracefully ignore _checkbw errors by tracking them
Samuel Pitoiset [Sat, 11 Aug 2012 10:42:17 +0000 (12:42 +0200)]
rtmp: Gracefully ignore _checkbw errors by tracking them

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortmp: Do not send _checkbw calls as notifications
Samuel Pitoiset [Sat, 11 Aug 2012 10:41:33 +0000 (12:41 +0200)]
rtmp: Do not send _checkbw calls as notifications

The _checkbw calls were changed to use transactionId 0 in commit
82613564 so that servers would not return _result/_error about it.
While this is the strict interpretation of the spec, there are
servers that return _error about it, even if transactionId was 0.

The latest version of EvoStream Media Server (the commercial version
of crtmpserver) behaves properly as described, i.e. returning an
_error normally but not returning anything when using transactionId
0. The latest version of crtmpserver (right now at least) doesn't
behave like this though, it returns an error even if transactionId
was 0.

There are also other servers that return errors even if transactionId
is set to 0. Therefore set a proper transaction id so that the invoke
can be tracked and the error properly ignored instead.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovda: better frame allocation.
Sebastien Zwickert [Tue, 14 Aug 2012 19:22:20 +0000 (21:22 +0200)]
vda: better frame allocation.

6 years agoprores: interlaced ProRes encoding
Maksalov Boris [Fri, 3 Aug 2012 17:50:05 +0000 (19:50 +0200)]
prores: interlaced ProRes encoding

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agobmv_videodec: fix out of array read
Michael Niedermayer [Tue, 14 Aug 2012 16:58:49 +0000 (18:58 +0200)]
bmv_videodec: fix out of array read

Fixes Ticket1373

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoremove duplicated code
upsuper [Tue, 14 Aug 2012 15:10:45 +0000 (23:10 +0800)]
remove duplicated code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoprores_kostya: implement interlaced encoding.
Boris Maksalov [Tue, 14 Aug 2012 09:03:36 +0000 (10:03 +0100)]
prores_kostya: implement interlaced encoding.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoprores_kostya: fix incorrect picture_size field.
Boris Maksalov [Tue, 14 Aug 2012 09:05:38 +0000 (10:05 +0100)]
prores_kostya: fix incorrect picture_size field.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd ICO muxer
Michael Bradshaw [Sun, 12 Aug 2012 16:29:36 +0000 (10:29 -0600)]
Add ICO muxer

Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoCheck for avio fail in avformat_write_header, av_write_frame
Andrey Utkin [Tue, 14 Aug 2012 09:48:45 +0000 (12:48 +0300)]
Check for avio fail in avformat_write_header, av_write_frame

With minor changes by michael
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 14 Aug 2012 13:31:43 +0000 (15:31 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  g723.1: simplify scale_vector()
  g723.1: simplify normalize_bits()
  vda: cosmetics: fix Doxygen comment formatting
  vda: better frame allocation
  vda: Merge implementation into one file
  vda: support synchronous decoding
  vda: Reuse the bitstream buffer and reallocate it only if needed
  build: Factor out mpegvideo encoding dependencies to CONFIG_MPEGVIDEOENC
  avprobe: Include libm.h for the log2 fallback
  proresenc: use the edge emulation buffer
  rtmp: handle bytes read reports
  configure: Fix typo in mpeg2video/svq1 decoder dependency declaration
  Use log2(x) instead of log(x) / log(2)
  x86: swscale: fix fragile memory accesses
  x86: swscale: remove disabled code
  x86: yadif: fix asm with suncc
  x86: cabac: allow building with suncc
  x86: mlpdsp: avoid taking address of void
  ARM: intmath: use native-size return types for clipping functions

Conflicts:
configure
ffprobe.c
libavcodec/Makefile
libavcodec/g723_1.c
libavcodec/v210dec.h
libavcodec/vda.h
libavcodec/vda_h264.c
libavcodec/x86/cabac.h
libavfilter/x86/yadif_template.c
libswscale/x86/rgb2rgb_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovda: fix make checkheaders.
Sebastien Zwickert [Tue, 14 Aug 2012 08:28:22 +0000 (10:28 +0200)]
vda: fix make checkheaders.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/asetnsamples: push as many frames as ready
Andrey Utkin [Tue, 7 Aug 2012 22:55:03 +0000 (01:55 +0300)]
lavfi/asetnsamples: push as many frames as ready

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agog723.1: simplify scale_vector()
Mans Rullgard [Mon, 13 Aug 2012 22:50:10 +0000 (23:50 +0100)]
g723.1: simplify scale_vector()

It is impossible for bits to be 15 here so the special case is
not needed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agog723.1: simplify normalize_bits()
Mans Rullgard [Mon, 13 Aug 2012 22:03:37 +0000 (23:03 +0100)]
g723.1: simplify normalize_bits()

This function is always called with a non-negative argument, so
those special cases are not needed.  In the places the argument
might be zero, the return value for a zero argument does not matter
since it would then be used to scale an array full of zeros.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agovda: cosmetics: fix Doxygen comment formatting
Sebastien Zwickert [Tue, 14 Aug 2012 09:48:17 +0000 (11:48 +0200)]
vda: cosmetics: fix Doxygen comment formatting

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agovda: better frame allocation
Sebastien Zwickert [Tue, 14 Aug 2012 09:47:39 +0000 (11:47 +0200)]
vda: better frame allocation

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agovda: Merge implementation into one file
Sebastien Zwickert [Tue, 14 Aug 2012 08:42:52 +0000 (10:42 +0200)]
vda: Merge implementation into one file

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agovda: support synchronous decoding
Sebastien Zwickert [Tue, 14 Aug 2012 09:45:29 +0000 (11:45 +0200)]
vda: support synchronous decoding

Note that the symbols used to run the hardware decoder in asynchronous mode
have been marked deprecated and will be dropped at a future version bump.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agovda: Reuse the bitstream buffer and reallocate it only if needed
Sebastien Zwickert [Mon, 13 Aug 2012 18:17:45 +0000 (20:17 +0200)]
vda: Reuse the bitstream buffer and reallocate it only if needed

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agofilter_design: document ownership and permissions.
Nicolas George [Sun, 12 Aug 2012 11:58:09 +0000 (13:58 +0200)]
filter_design: document ownership and permissions.

6 years agolavfi: use min_perms and rej_perms for out pads.
Nicolas George [Sun, 12 Aug 2012 08:59:37 +0000 (10:59 +0200)]
lavfi: use min_perms and rej_perms for out pads.

There are several reasons for doing that:

1. It documents the code for the reader and helps find
   inconsistencies and bugs.

2. For rej_perms, it guarantees the change will be done
   even if the output reference can be created by several
   code paths.

3. It can be used to predict cases where a copy will,
   or will not happen and optimize buffer allocation
   (for example not request a rare direct-rendering buffer
   from a device sink if it will be copied anyway).

Note that a filter is still allowed to manage the permissions
on its own without using these fields.

6 years agodvdsubenc: reindent after recent commit.
Nicolas George [Tue, 14 Aug 2012 09:58:32 +0000 (11:58 +0200)]
dvdsubenc: reindent after recent commit.

6 years agolavc: add const to AVCodecContext.codec_descriptor.
Nicolas George [Mon, 13 Aug 2012 09:28:10 +0000 (11:28 +0200)]
lavc: add const to AVCodecContext.codec_descriptor.

6 years agolavc: reimplement avcodec_get_name with descriptors.
Nicolas George [Mon, 13 Aug 2012 09:27:20 +0000 (11:27 +0200)]
lavc: reimplement avcodec_get_name with descriptors.

6 years agoffmpeg: copy subtitles frame dimensions.
Nicolas George [Thu, 9 Aug 2012 09:55:22 +0000 (11:55 +0200)]
ffmpeg: copy subtitles frame dimensions.

The sub-movtextenc ref file changes because the dimensions
(400×60) are stored by the format.