ffmpeg.git
7 years agoindeo5: check quant_mat
Michael Niedermayer [Thu, 31 May 2012 03:01:28 +0000 (05:01 +0200)]
indeo5: check quant_mat

prevents out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: dont freopen() stdout
Michael Niedermayer [Thu, 31 May 2012 00:56:56 +0000 (02:56 +0200)]
fate: dont freopen() stdout

it doesnt work and breaks most BSDs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorange coder test code: decoding errors are av_log_error not debug.
Michael Niedermayer [Wed, 30 May 2012 22:48:29 +0000 (00:48 +0200)]
range coder test code: decoding errors are av_log_error not debug.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1: fix reading global header with CRC
Michael Niedermayer [Wed, 30 May 2012 22:47:36 +0000 (00:47 +0200)]
ffv1: fix reading global header with CRC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavidec: fix odd extradata size case.
Michael Niedermayer [Wed, 30 May 2012 22:46:47 +0000 (00:46 +0200)]
avidec: fix odd extradata size case.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavformat: ff_get_bmp_header: return esize too
Michael Niedermayer [Wed, 30 May 2012 22:46:02 +0000 (00:46 +0200)]
libavformat: ff_get_bmp_header: return esize too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 30 May 2012 17:32:06 +0000 (19:32 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pcm-mpeg: improve log message wording
  fate: add missing $(TARGET_PATH) to ac3-fixed-encode
  fate: fix md5sum replacement on some systems
  avprobe: correctly set the default formatter
  lavr: add x86-optimized function for mixing 2 to 1 s16p with q8 coeffs
  lavr: add x86-optimized functions for mixing 2 to 1 s16p with float coeffs
  lavr: add C functions for mixing 2 to 1 channels with s16p format
  avprobe: move formatter functions in the context

Conflicts:
ffprobe.c
libavcodec/pcm-mpeg.c
tests/fate/ac3.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopcm-mpeg: improve log message wording
Christian Schmidt [Wed, 30 May 2012 11:40:23 +0000 (11:40 +0000)]
pcm-mpeg: improve log message wording

We support every defined value for channel layout, bitrate and sample depth.
All other values are not unsupported, but reserved.
Update comments to say "are used" instead of "are known or exist".

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agoh264_cavlc: check prefix before using it.
Michael Niedermayer [Wed, 30 May 2012 14:42:01 +0000 (16:42 +0200)]
h264_cavlc: check prefix before using it.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: increase scantable sizes to avoid overread
Michael Niedermayer [Wed, 30 May 2012 14:40:33 +0000 (16:40 +0200)]
h264: increase scantable sizes to avoid overread

We could also check the index but this would slow speed critical code
down.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotruemotion1: Check index, fix out of array read
Michael Niedermayer [Wed, 30 May 2012 14:19:36 +0000 (16:19 +0200)]
truemotion1: Check index, fix out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: disable autoinsertion for -async on the output side of the filtergraph.
Michael Niedermayer [Wed, 30 May 2012 13:55:31 +0000 (15:55 +0200)]
ffmpeg: disable autoinsertion for -async on the output side of the filtergraph.

This fixes the issue that since the last merge -async caused 2 aresample
filters to be inserted
users that generate funny timestamps in a filtergraph should probably
manually insert a aresample filter where they need it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocmdutils: replace 1 line #ifs by if()
Michael Niedermayer [Wed, 30 May 2012 13:27:42 +0000 (15:27 +0200)]
cmdutils: replace 1 line #ifs by if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAllow building of command line utils without swresample lib
Gavin Kinsey [Tue, 29 May 2012 14:43:33 +0000 (14:43 +0000)]
Allow building of command line utils without swresample lib

This allows building ffprobe without swresample

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoexr: make message about missing feature more useful
Paul B Mahol [Wed, 30 May 2012 12:07:41 +0000 (12:07 +0000)]
exr: make message about missing feature more useful

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agofate: fix long standing bug in the g723_1 test
Michael Niedermayer [Wed, 30 May 2012 11:22:28 +0000 (13:22 +0200)]
fate: fix long standing bug in the g723_1 test

The test compared files of mismatching sample rate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: add a fate-acodec-dca test that works on all platforms second try
Michael Niedermayer [Wed, 30 May 2012 10:59:55 +0000 (12:59 +0200)]
fate: add a fate-acodec-dca test that works on all platforms  second try

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: add bitexact flag to ac3-fixed
Michael Niedermayer [Wed, 30 May 2012 10:54:22 +0000 (12:54 +0200)]
fate: add bitexact flag to ac3-fixed

cant hurt, and should be there for all tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoiff: check if there is extradata
Paul B Mahol [Wed, 30 May 2012 07:50:32 +0000 (07:50 +0000)]
iff: check if there is extradata

Fixes #1368.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoexr: alpha support
Paul B Mahol [Tue, 29 May 2012 10:37:01 +0000 (10:37 +0000)]
exr: alpha support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agofate: add missing $(TARGET_PATH) to ac3-fixed-encode
Mans Rullgard [Wed, 30 May 2012 04:17:50 +0000 (05:17 +0100)]
fate: add missing $(TARGET_PATH) to ac3-fixed-encode

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agofate: fix md5sum replacement on some systems
Mans Rullgard [Wed, 30 May 2012 02:31:16 +0000 (03:31 +0100)]
fate: fix md5sum replacement on some systems

On systems where the 'md5' command is used, there is a conflict
with the md5() shell function in fate-run.sh.  Using the 'command'
keyword bypasses the shell function for correct behaviour.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agofate: disable fate-acodec-dca
Michael Niedermayer [Wed, 30 May 2012 04:48:13 +0000 (06:48 +0200)]
fate: disable fate-acodec-dca

the new test doesnt work on all platforms, thus disable it until a better solution is found.
the dca2 test remains and provides partial testing until this is resolved

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: remove unused functions
Michael Niedermayer [Wed, 30 May 2012 03:23:39 +0000 (05:23 +0200)]
fate: remove unused functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: remove tests/codec-regression.sh
Michael Niedermayer [Wed, 30 May 2012 03:22:20 +0000 (05:22 +0200)]
fate: remove tests/codec-regression.sh

This was somehow forgotten in todays merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: resurrect acodec-dca
Michael Niedermayer [Wed, 30 May 2012 03:20:40 +0000 (05:20 +0200)]
fate: resurrect acodec-dca

This was lost in todays merge
Ideas to do this less ugly are welcome!

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: clarify experimental codec message
Lou Logan [Wed, 30 May 2012 01:43:23 +0000 (17:43 -0800)]
lavc: clarify experimental codec message

Should be easier for new users to get a working output.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: try to fix fate-nellymoser-aref-encode make dependancies
Michael Niedermayer [Wed, 30 May 2012 02:52:13 +0000 (04:52 +0200)]
fate: try to fix fate-nellymoser-aref-encode make dependancies

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: make idroq test run again.
Michael Niedermayer [Wed, 30 May 2012 02:38:41 +0000 (04:38 +0200)]
fate: make idroq test run again.

Didnt investigate what broke it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 30 May 2012 01:32:32 +0000 (03:32 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: extend -r to work on any input stream.
  doc/avconv: expand documentation for the -s option.
  avconv: don't print filters inserted by avconv in stream mappings.
  avconv: merge configuration code for complex and simple filters
  avconv: split configuring input filters out of configure_complex_filter

Conflicts:
configure
doc/ffmpeg.texi
ffmpeg.c
tests/ref/fate/idroq-video-encode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'
Michael Niedermayer [Tue, 29 May 2012 23:39:24 +0000 (01:39 +0200)]
Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

* commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725':
  fate: fix acodec/vsynth tests for make 3.81
  pcm_mpeg: fix number of consumed bytes to include the header.
  avfilter: include required header file avfilter.h in video.h
  x86: Avoid movs on BUTTERFLYPS when in AVX mode
  x86: use new schema for ASM macros
  fate: convert codec-regression.sh to makefile rules
  fate: allow tests to specify unit size for psnr comparison
  fate: teach videogen/rotozoom to output a single raw video stream
  http: Add support for reusing the http socket for subsequent requests
  http: Add support for using persistent connections

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffprobe: fix C escaping.
Clément Bœsch [Tue, 29 May 2012 21:16:03 +0000 (23:16 +0200)]
ffprobe: fix C escaping.

7 years agoavprobe: correctly set the default formatter
Luca Barbato [Tue, 29 May 2012 20:14:10 +0000 (13:14 -0700)]
avprobe: correctly set the default formatter

7 years agolavf/microdvd: support events lasting to the next one.
Clément Bœsch [Sat, 26 May 2012 20:37:02 +0000 (22:37 +0200)]
lavf/microdvd: support events lasting to the next one.

Example:

{3350}{}this subtitle...
{3390}{}...continues up to...
{4000}{4500}this one.
{4600}{}and now...
{4800}{}...to the end of the presentation

7 years agolavc: switch from ts_end to duration in ff_ass_add_rect.
Clément Bœsch [Sat, 26 May 2012 20:36:31 +0000 (22:36 +0200)]
lavc: switch from ts_end to duration in ff_ass_add_rect.

Make possible a end-to-presentation duration.

7 years agolavr: add x86-optimized function for mixing 2 to 1 s16p with q8 coeffs
Justin Ruggles [Mon, 23 Apr 2012 19:10:35 +0000 (15:10 -0400)]
lavr: add x86-optimized function for mixing 2 to 1 s16p with q8 coeffs

7 years agolavr: add x86-optimized functions for mixing 2 to 1 s16p with float coeffs
Justin Ruggles [Mon, 23 Apr 2012 19:04:09 +0000 (15:04 -0400)]
lavr: add x86-optimized functions for mixing 2 to 1 s16p with float coeffs

7 years agolavr: add C functions for mixing 2 to 1 channels with s16p format
Justin Ruggles [Mon, 23 Apr 2012 18:50:22 +0000 (14:50 -0400)]
lavr: add C functions for mixing 2 to 1 channels with s16p format

7 years agoavprobe: move formatter functions in the context
Luca Barbato [Mon, 28 May 2012 02:35:10 +0000 (19:35 -0700)]
avprobe: move formatter functions in the context

Avoid possible clashes.

7 years agoape: Fix null ptr dereference with files missing a seekatable.
Michael Niedermayer [Tue, 29 May 2012 17:50:15 +0000 (19:50 +0200)]
ape: Fix null ptr dereference with files missing a seekatable.

Such files are currently not supported as the table is used at several points

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomovdec: Check count of stts/ctts elements instead of just the pointer.
Michael Niedermayer [Tue, 29 May 2012 17:28:09 +0000 (19:28 +0200)]
movdec: Check count of stts/ctts elements instead of just the pointer.

Fixes overreading the array

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago4xm: fix division by zero caused by bps<8
Michael Niedermayer [Tue, 29 May 2012 17:16:22 +0000 (19:16 +0200)]
4xm: fix division by zero caused by bps<8

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavconv: extend -r to work on any input stream.
Anton Khirnov [Sat, 26 May 2012 14:52:58 +0000 (16:52 +0200)]
avconv: extend -r to work on any input stream.

This is done by automatically inserting a setpts filter.

7 years agodoc/avconv: expand documentation for the -s option.
Anton Khirnov [Sat, 26 May 2012 11:52:44 +0000 (13:52 +0200)]
doc/avconv: expand documentation for the -s option.

7 years agoavconv: don't print filters inserted by avconv in stream mappings.
Anton Khirnov [Sat, 26 May 2012 11:31:54 +0000 (13:31 +0200)]
avconv: don't print filters inserted by avconv in stream mappings.

7 years agoavconv: merge configuration code for complex and simple filters
Anton Khirnov [Sat, 26 May 2012 10:47:47 +0000 (12:47 +0200)]
avconv: merge configuration code for complex and simple filters

Some tests change because -s now inserts the scaler to the end instead
of beginning of the filtergraph.

7 years agoavconv: split configuring input filters out of configure_complex_filter
Anton Khirnov [Sat, 26 May 2012 09:18:21 +0000 (11:18 +0200)]
avconv: split configuring input filters out of configure_complex_filter

7 years agoffprobe: make -of an alias for -print_format.
Clément Bœsch [Tue, 29 May 2012 16:50:13 +0000 (18:50 +0200)]
ffprobe: make -of an alias for -print_format.

This is for interoperability purpose with the fork.

7 years agofate: fix acodec/vsynth tests for make 3.81
Mans Rullgard [Tue, 29 May 2012 08:49:44 +0000 (09:49 +0100)]
fate: fix acodec/vsynth tests for make 3.81

GNU make 3.81 applies pattern rules in declaration order rather than
by stem length as in 3.82.  This moves the more generic patterns above
the more specific ones such that they work with either make version.
Some of the vsynth patterns are also simplified a little.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoffprobe: fix chapter printing, fix JSON output
Stefano Sabatini [Tue, 29 May 2012 16:08:00 +0000 (18:08 +0200)]
ffprobe: fix chapter printing, fix JSON output

Make writer_print_chapter_header() set the internal values *before* the
private writer callback is called, otherwise the accessed internal values
will be wrong.

Fix regression introduced in fa6cb2fdffe.

Found-By: Daemon404
7 years agopcm_mpeg: fix number of consumed bytes to include the header.
Hendrik Leppkes [Tue, 10 Apr 2012 17:49:14 +0000 (19:49 +0200)]
pcm_mpeg: fix number of consumed bytes to include the header.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
7 years agoavfilter: include required header file avfilter.h in video.h
Janne Grunau [Tue, 29 May 2012 13:36:06 +0000 (15:36 +0200)]
avfilter: include required header file avfilter.h in video.h

7 years agox86: Avoid movs on BUTTERFLYPS when in AVX mode
Vitor Sessak [Fri, 11 May 2012 20:32:08 +0000 (22:32 +0200)]
x86: Avoid movs on BUTTERFLYPS when in AVX mode

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
7 years agox86: use new schema for ASM macros
Vitor Sessak [Sun, 27 May 2012 17:43:56 +0000 (17:43 +0000)]
x86: use new schema for ASM macros

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
7 years agoChangelog: apply misc formatting fixes
Stefano Sabatini [Tue, 29 May 2012 10:59:10 +0000 (12:59 +0200)]
Changelog: apply misc formatting fixes

7 years agoChangelog: remove asplit entry from 0.11, it was added in 0.10
Stefano Sabatini [Tue, 29 May 2012 10:57:33 +0000 (12:57 +0200)]
Changelog: remove asplit entry from 0.11, it was added in 0.10

7 years agoffprobe: add INI writer
Stefano Sabatini [Sat, 26 May 2012 23:24:19 +0000 (01:24 +0200)]
ffprobe: add INI writer

Liberally based on the work of Luca Barbato <lu_zero@gentoo.org>, done
for libav/avprobe.

7 years agoavfilter: use designated initializer for class
Paul B Mahol [Tue, 29 May 2012 07:59:21 +0000 (07:59 +0000)]
avfilter: use designated initializer for class

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agofate: convert codec-regression.sh to makefile rules
Mans Rullgard [Fri, 18 May 2012 09:33:28 +0000 (10:33 +0100)]
fate: convert codec-regression.sh to makefile rules

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agofate: allow tests to specify unit size for psnr comparison
Mans Rullgard [Thu, 17 May 2012 18:14:17 +0000 (19:14 +0100)]
fate: allow tests to specify unit size for psnr comparison

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agofate: teach videogen/rotozoom to output a single raw video stream
Mans Rullgard [Thu, 17 May 2012 14:55:14 +0000 (15:55 +0100)]
fate: teach videogen/rotozoom to output a single raw video stream

This makes videogen/rotozoom output a raw video stream on stdout
if no output directory is specified.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agodoc/syntax: escape '@' to fix a warning.
Clément Bœsch [Tue, 29 May 2012 05:40:12 +0000 (07:40 +0200)]
doc/syntax: escape '@' to fix a warning.

Fix the following warning:
doc/syntax.texi:147: warning: Accent command `@"' must not be followed by whitespace

7 years agolavc: prettify printing of some codec tags which contains non alphanumeric characters
Stefano Sabatini [Fri, 25 May 2012 23:38:03 +0000 (01:38 +0200)]
lavc: prettify printing of some codec tags which contains non alphanumeric characters

Make av_get_codec_tag_string() show codec tag string characters in a more
intelligible ways. For example the ascii char "@" is used as a number, so
should be displayed like "[64]" rather than as a printable character.

Apart alphanumeric chars, only the characters ' ' and '.' are used
literally in codec tags, all the other characters represent numbers.

7 years agoffprobe: add multiple_sections field to WriterContext
Stefano Sabatini [Sat, 26 May 2012 22:59:28 +0000 (00:59 +0200)]
ffprobe: add multiple_sections field to WriterContext

Move the field "multiple_entries" from the JSON writer private context to
WriterContext, and rename it "multiple_sections".

This allows to factorize the code with the pending INI format patch.

7 years agoffprobe: add support to '\b' and '\f' escaping in c_escape_str()
Stefano Sabatini [Sat, 26 May 2012 18:58:13 +0000 (20:58 +0200)]
ffprobe: add support to '\b' and '\f' escaping in c_escape_str()

7 years agoffprobe: make c_escape_str() documentation terser
Stefano Sabatini [Sat, 26 May 2012 23:28:26 +0000 (01:28 +0200)]
ffprobe: make c_escape_str() documentation terser

Avoid to specify implementation details, better to check the code for
that.

7 years agolavfi: use getter/setter functions for AVFrame.pkt_pos
Michael Niedermayer [Mon, 28 May 2012 21:43:51 +0000 (23:43 +0200)]
lavfi: use getter/setter functions for AVFrame.pkt_pos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomovenc: Fix muxing of Apple Quicktime chapters. v3
Philip Langdale [Sun, 20 May 2012 00:10:47 +0000 (17:10 -0700)]
movenc: Fix muxing of Apple Quicktime chapters. v3

There is basic support for muxing chapter information into the
Apple Quicktime format already, but there are two errors which
prevent correct detection on the player side.

1) A special apple 'text' atom needs to be included inside the
gmhd atom.

2) The *different* 'text' atom inside the 'stsd' atom needs a
proper header.

With these changes, the chapters are now picked up by Apple
players and reported correctly by tools like mediainfo and mp4chaps.

v3 Update: The stub TextSampleEntry creation is moved to where the
chapter track is created so it's now specific to this track.

Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: Fill linesize, sample_rate and channel_layout fields in avfilter_fill_frame_fr...
Robert Nagy [Mon, 28 May 2012 19:45:36 +0000 (21:45 +0200)]
lavfi: Fill linesize, sample_rate and channel_layout fields in avfilter_fill_frame_from_audio_buffer_ref.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: use %f instead of %lf in volume args format printf.
Clément Bœsch [Mon, 28 May 2012 20:17:01 +0000 (22:17 +0200)]
ffmpeg: use %f instead of %lf in volume args format printf.

%f refers to a double argument already.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 28 May 2012 20:07:34 +0000 (22:07 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  AVOptions: fix the value printed in out of range error message.

Conflicts:
libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: disable avresample by default
Michael Niedermayer [Mon, 28 May 2012 17:43:57 +0000 (19:43 +0200)]
configure: disable avresample by default

avresample is redundant and unneeded

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: add asyncts->avresample dependancy
Michael Niedermayer [Mon, 28 May 2012 17:43:34 +0000 (19:43 +0200)]
configure: add asyncts->avresample  dependancy
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix r10k codec for widths that are not multiples of 64.
Carl Eugen Hoyos [Mon, 28 May 2012 17:05:15 +0000 (19:05 +0200)]
Fix r10k codec for widths that are not multiples of 64.

Fixes ticket #1358

7 years agoMark avui encoder experimental.
Carl Eugen Hoyos [Mon, 28 May 2012 16:20:39 +0000 (18:20 +0200)]
Mark avui encoder experimental.

Some decoders require the AVID atom that we currently
do not write when encoding avui.

7 years agojvdec: check videosize
Michael Niedermayer [Mon, 28 May 2012 15:21:29 +0000 (17:21 +0200)]
jvdec: check videosize

Fixes null ptr dereference
fixes Ticket1364

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomotionpixels: check extradata size
Michael Niedermayer [Mon, 28 May 2012 15:17:49 +0000 (17:17 +0200)]
motionpixels: check extradata size

Fixes null ptr derefernce
Fixes Ticket1363

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoiff_ilbm: fix null ptr deref
Michael Niedermayer [Mon, 28 May 2012 15:13:10 +0000 (17:13 +0200)]
iff_ilbm: fix null ptr deref

Fixes Ticket1362

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoyop: check for missing extradata
Michael Niedermayer [Mon, 28 May 2012 15:08:06 +0000 (17:08 +0200)]
yop: check for missing extradata

Fixes null ptr deref
Fixes Ticket1361

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoxan: fix out of array read
Michael Niedermayer [Mon, 28 May 2012 15:04:38 +0000 (17:04 +0200)]
xan: fix out of array read

Fixes ticket1360

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocdgraphics: Fix out of array write
Michael Niedermayer [Mon, 28 May 2012 14:50:15 +0000 (16:50 +0200)]
cdgraphics: Fix out of array write

Fixes Ticket1359

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoTest extradata size before reading from extradata when decoding avui.
Carl Eugen Hoyos [Mon, 28 May 2012 13:58:46 +0000 (15:58 +0200)]
Test extradata size before reading from extradata when decoding avui.

7 years agoconfigure: fix the wording for gpl incompatible licenses warnings
Michael Niedermayer [Mon, 28 May 2012 13:44:11 +0000 (15:44 +0200)]
configure: fix the wording for gpl incompatible licenses warnings

calling the 4 clause BSD license non free is quite a stretch ;)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: openssl is compatible with the LGPL.
Michael Niedermayer [Mon, 28 May 2012 13:36:35 +0000 (15:36 +0200)]
configure: openssl is compatible with the LGPL.

looking at the license i cannot see why they would be incompatible and
researching this matter a bit also turned up no reasons.

If i missed something, please dont hesitate to flame me and or revert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohttp: Add support for reusing the http socket for subsequent requests
Samuel Pitoiset [Mon, 28 May 2012 13:03:54 +0000 (15:03 +0200)]
http: Add support for reusing the http socket for subsequent requests

Introduce ff_http_do_new_request(), a new function which sends a new
HTTP request, reusing the existing connection to the server.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agohttp: Add support for using persistent connections
Samuel Pitoiset [Mon, 28 May 2012 13:03:19 +0000 (15:03 +0200)]
http: Add support for using persistent connections

Add a new AVOption 'multiple_requests', which indicates if we want
to use persistent connections (ie. Connection: keep-alive).

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoAVOptions: fix the value printed in out of range error message.
Anton Khirnov [Mon, 28 May 2012 05:27:15 +0000 (07:27 +0200)]
AVOptions: fix the value printed in out of range error message.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 27 May 2012 22:15:14 +0000 (00:15 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avprobe: restore pseudo-INI old style format for compatibility.
  avprobe: fix formatting.
  log: make colored output more colorful.
  rtsp: Check for dynamic payload handlers if no static payload mapping was found

Conflicts:
Changelog
doc/ffprobe.texi
ffprobe.c
libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavienc: create xsub in avi files that are closer to whats in the wild
Michael Niedermayer [Sun, 27 May 2012 20:45:52 +0000 (22:45 +0200)]
avienc: create xsub in avi files that are closer to whats in the wild

Fixes ticket1332

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sun, 27 May 2012 14:04:05 +0000 (16:04 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: force exit when filter configuration fails
  ffplay: fix stream cycling if audio decoding fails
  ffplay: flush codec buffers before freeing filters
  ffplay: dont destroy packet queues on stream change

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotests and tools: cleanup ffmpeg reference
Michael Niedermayer [Sun, 27 May 2012 13:34:47 +0000 (15:34 +0200)]
tests and tools: cleanup ffmpeg reference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: use new schema for ASM macros
Vitor Sessak [Sun, 27 May 2012 10:17:28 +0000 (12:17 +0200)]
x86: use new schema for ASM macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomxfdec: remove unused last_index_duration
Michael Niedermayer [Sun, 27 May 2012 09:50:38 +0000 (11:50 +0200)]
mxfdec: remove unused last_index_duration

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoChangelog: fix wrong/inaccurate entries.
Clément Bœsch [Sun, 27 May 2012 13:28:15 +0000 (15:28 +0200)]
Changelog: fix wrong/inaccurate entries.

7 years agoSupport decoding fourcc YVYU.
Carl Eugen Hoyos [Sat, 26 May 2012 23:13:37 +0000 (01:13 +0200)]
Support decoding fourcc YVYU.

Based on work by ami_stuff.

Fixes ticket #1352

7 years agolavfi/deshake: add libavcodec dependency (dsputil).
Clément Bœsch [Sat, 26 May 2012 22:34:09 +0000 (00:34 +0200)]
lavfi/deshake: add libavcodec dependency (dsputil).

7 years agoffprobe: reduce the number of AVBPrint resets.
Clément Bœsch [Fri, 25 May 2012 23:27:19 +0000 (01:27 +0200)]
ffprobe: reduce the number of AVBPrint resets.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 26 May 2012 20:37:37 +0000 (22:37 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  opt: Add av_opt_set_bin()
  avconv: Display the error returned by avformat_write_header
  rtpenc_chain: Return an error code instead of just a plain pointer
  rtpenc_chain: Free the URLContext on failure
  rtpenc: Expose the ssrc as an avoption
  avprobe: display the codec profile in show_stream()
  avprobe: fix function prototype
  cosmetics: Fix indentation
  avprobe: changelog entry
  avprobe: update documentation
  avprobe: provide JSON output
  avprobe: output proper INI format
  avprobe: improve formatting
  rtmp: fix url parsing
  fate: document TARGET_EXEC and its usage

Conflicts:
doc/APIchanges
doc/fate.texi
doc/ffprobe.texi
ffprobe.c
libavformat/version.h
libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavprobe: restore pseudo-INI old style format for compatibility.
Anton Khirnov [Sat, 26 May 2012 06:54:25 +0000 (08:54 +0200)]
avprobe: restore pseudo-INI old style format for compatibility.

7 years agoavprobe: fix formatting.
Anton Khirnov [Sat, 26 May 2012 06:52:19 +0000 (08:52 +0200)]
avprobe: fix formatting.