ffmpeg.git
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 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 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 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.

7 years agolog: make colored output more colorful.
Anton Khirnov [Sat, 26 May 2012 06:24:14 +0000 (08:24 +0200)]
log: make colored output more colorful.

Green for verbose, cyan for debug.

7 years agoaacdec: fix "may be used uninitialized" warning
Michael Niedermayer [Sat, 26 May 2012 19:03:58 +0000 (21:03 +0200)]
aacdec: fix "may be used uninitialized" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaacpsy: fix "may be used uninitialized" warning
Michael Niedermayer [Sat, 26 May 2012 18:59:57 +0000 (20:59 +0200)]
aacpsy: fix "may be used uninitialized" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agortsp: Check for dynamic payload handlers if no static payload mapping was found
Martin Storsjö [Thu, 8 Dec 2011 13:19:58 +0000 (15:19 +0200)]
rtsp: Check for dynamic payload handlers if no static payload mapping was found

Some systems abuse the static payload types 35 or 36 (which
according to IANA are unassigned) for H264.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoFix tests without fate samples.
Alexis Ballier [Sat, 26 May 2012 18:06:12 +0000 (14:06 -0400)]
Fix tests without fate samples.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavio: fix "discards const qualifier from pointer target type" warning
Michael Niedermayer [Sat, 26 May 2012 18:04:19 +0000 (20:04 +0200)]
avio: fix "discards const qualifier from pointer target type" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolswsutils: fix "ncompatible pointer type" warning
Michael Niedermayer [Sat, 26 May 2012 17:54:27 +0000 (19:54 +0200)]
lswsutils: fix "ncompatible pointer type" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfutils: fix incompatible pointer type warning
Michael Niedermayer [Sat, 26 May 2012 17:50:05 +0000 (19:50 +0200)]
lavfutils: fix incompatible pointer type warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaf_aresample: fix pts, they where off by a packet in the -async >0 case.
Michael Niedermayer [Sat, 26 May 2012 14:17:47 +0000 (16:17 +0200)]
af_aresample: fix pts, they where off by a packet in the -async >0 case.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoopt: Add av_opt_set_bin()
Samuel Pitoiset [Fri, 25 May 2012 10:32:39 +0000 (12:32 +0200)]
opt: Add av_opt_set_bin()

Introduce a new function to set binary data through AVOption,
avoiding having to convert the binary data to a string inbetween.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoChangelog, spell out the CVEs that where fixed.
Michael Niedermayer [Sat, 26 May 2012 01:08:44 +0000 (03:08 +0200)]
Changelog, spell out the CVEs that where fixed.

there are some holes in the list as some things have been fixed
in previous releases already.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffprobe: display the codec profile in show_stream()
Christian Schmidt [Fri, 25 May 2012 13:01:59 +0000 (15:01 +0200)]
ffprobe: display the codec profile in show_stream()

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agoavconv: Display the error returned by avformat_write_header
Martin Storsjö [Fri, 25 May 2012 21:55:56 +0000 (00:55 +0300)]
avconv: Display the error returned by avformat_write_header

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortpenc_chain: Return an error code instead of just a plain pointer
Martin Storsjö [Fri, 25 May 2012 19:26:00 +0000 (22:26 +0300)]
rtpenc_chain: Return an error code instead of just a plain pointer

Also check the return value in sapenc.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortpenc_chain: Free the URLContext on failure
Martin Storsjö [Fri, 25 May 2012 21:40:54 +0000 (00:40 +0300)]
rtpenc_chain: Free the URLContext on failure

If an URLContext is passed in, its ownership is given to this
function, and is either owned by the returned AVFormatContext
on a successful return, or freed on failure.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortpenc: Expose the ssrc as an avoption
Martin Storsjö [Fri, 25 May 2012 21:18:01 +0000 (00:18 +0300)]
rtpenc: Expose the ssrc as an avoption

This allows the caller to set it, and allows the caller to query
what it was set to.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agotests/lavfi: use do_lavfi_pixfmts for the pixdesctest test
Stefano Sabatini [Sat, 26 May 2012 10:02:30 +0000 (12:02 +0200)]
tests/lavfi: use do_lavfi_pixfmts for the pixdesctest test

Simplify, and as a side effect extend the number of supported formats, in
particular add a test for pal8.

7 years agotests/lavfi: rework lavfi-regression.sh, avoid use of ffmpeg -pix_fmts
Stefano Sabatini [Sat, 26 May 2012 08:45:48 +0000 (10:45 +0200)]
tests/lavfi: rework lavfi-regression.sh, avoid use of ffmpeg -pix_fmts

Use lavfi-showfiltfmts for checking the format supported by the scale
filter instead. The advantage is that the scale filter may support
formats which are not supported by libswscale (namely: the pal8 format).

The new implementation is also a bit cleaner, because it doesn't depend
on the ffmpeg output.

7 years agoswr: fix swr_drop_output()
Michael Niedermayer [Sat, 26 May 2012 00:33:38 +0000 (02:33 +0200)]
swr: fix swr_drop_output()

Fixes part of Ticket1341

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaf_aresample: fix request_frame()
Michael Niedermayer [Sat, 26 May 2012 00:28:40 +0000 (02:28 +0200)]
af_aresample: fix request_frame()

Fixes part of Ticket1341

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavprobe: display the codec profile in show_stream()
Christian Schmidt [Fri, 25 May 2012 22:34:12 +0000 (15:34 -0700)]
avprobe: display the codec profile in show_stream()

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoavprobe: fix function prototype
Luca Barbato [Fri, 25 May 2012 22:19:50 +0000 (15:19 -0700)]
avprobe: fix function prototype

Make opt_output_format return the correct value.

7 years agoSupport some BOXX codecs.
ami_stuff [Fri, 25 May 2012 22:13:44 +0000 (00:13 +0200)]
Support some BOXX codecs.

Fixes a part of ticket #1352.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocosmetics: Fix indentation
Martin Storsjö [Fri, 25 May 2012 19:16:06 +0000 (22:16 +0300)]
cosmetics: Fix indentation

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoavprobe: changelog entry
Luca Barbato [Fri, 25 May 2012 19:58:58 +0000 (12:58 -0700)]
avprobe: changelog entry

7 years agoavprobe: update documentation
Luca Barbato [Fri, 25 May 2012 19:57:36 +0000 (12:57 -0700)]
avprobe: update documentation

Update the documentation according to the latest changes

7 years agoavprobe: provide JSON output
Luca Barbato [Thu, 24 May 2012 19:22:29 +0000 (12:22 -0700)]
avprobe: provide JSON output

JSON usage is quite widespread.

7 years agoavprobe: output proper INI format
Luca Barbato [Fri, 18 May 2012 01:02:57 +0000 (18:02 -0700)]
avprobe: output proper INI format

Make the output valid INI serialization.

7 years agoavprobe: improve formatting
Luca Barbato [Fri, 25 May 2012 18:47:06 +0000 (11:47 -0700)]
avprobe: improve formatting

Do not use decimals if not needed.

7 years agortmp: fix url parsing
Luca Barbato [Tue, 15 May 2012 00:24:27 +0000 (17:24 -0700)]
rtmp: fix url parsing

The application component can have a subcomponent to specify the
application instance even if it doesn't have a ":" in the playpath.

7 years agofate: document TARGET_EXEC and its usage
Luca Barbato [Mon, 14 May 2012 22:44:30 +0000 (15:44 -0700)]
fate: document TARGET_EXEC and its usage

TARGET_EXEC allows running FATE on simulators, remote targets and
memory checkers. Also document a known issue with Wine and mixed
Unix/Windows line ending.

7 years agoMerge remote-tracking branch 'qatar/master' n0.12-dev
Michael Niedermayer [Fri, 25 May 2012 18:48:50 +0000 (20:48 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Don't write the 'wave' atom or its child 'enda' for lpcm audio.
  imc: some cosmetics
  rtmp: Pass the proper return code in rtmp_handshake
  rtmp: Check return codes of net IO operations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomovenc: Don't write the 'wave' atom or its child 'enda' for lpcm audio.
Alex Converse [Wed, 23 May 2012 18:32:52 +0000 (11:32 -0700)]
movenc: Don't write the 'wave' atom or its child 'enda' for lpcm audio.

It's left over from stsd v0. QuickTime 7 no longer writes 'wave' or 'enda'
when 'lpcm' is the audio tag.

7 years agoimc: some cosmetics
Kostya Shishkov [Tue, 22 May 2012 17:45:00 +0000 (19:45 +0200)]
imc: some cosmetics

7 years agolibavfilter: export ff_default_query_formats()
Michael Niedermayer [Fri, 25 May 2012 16:54:01 +0000 (18:54 +0200)]
libavfilter: export ff_default_query_formats()

Its needed for fate on shared versioned .so

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorelease_notes: update
Michael Niedermayer [Fri, 25 May 2012 15:27:40 +0000 (17:27 +0200)]
release_notes: update

Note, if you want something mentioned in the release notes for 0.11
push it but be real quick ...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRevert "removing lowres support"
Michael Niedermayer [Fri, 25 May 2012 10:35:42 +0000 (12:35 +0200)]
Revert "removing lowres support"

There have been multiple user complaints about loosing this feature
while its not clear the 3% speedloss claims where real or fabricated.
My own testing indicates no statistically significant speed difference
both with mpeg2 and mpeg4, and if at all the code with lowres support
is a tiny bit faster than without.

This reverts commit 92ef4be4ab9fbb7d901b22e0036a4ca90b00a476, reversing
changes made to 2e07f42957666df6d7c63a62263b8447e97b1442.

Conflicts:

cmdutils.c
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavutil/arm/Makefile

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavdevice: bump soname due to lavf soname bump
Michael Niedermayer [Fri, 25 May 2012 10:22:21 +0000 (12:22 +0200)]
avdevice: bump soname due to lavf soname bump

avdevice is just a part of lavf and uses lavf API/ABI/structures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/pixdesctest: use AVPALETTE_SIZE macro
Stefano Sabatini [Fri, 25 May 2012 09:16:40 +0000 (11:16 +0200)]
lavfi/pixdesctest: use AVPALETTE_SIZE macro

7 years agolavfi/pixdesctest: fix SAME -> SAME memcpy
Stefano Sabatini [Fri, 25 May 2012 01:03:38 +0000 (03:03 +0200)]
lavfi/pixdesctest: fix SAME -> SAME memcpy

Fix pixdesctest output with pal8 input.

X-Cola-Count: +(10+i*PI)l

7 years agolavfi/hflip: copy palette data in start_frame()
Stefano Sabatini [Sat, 7 Apr 2012 07:57:07 +0000 (09:57 +0200)]
lavfi/hflip: copy palette data in start_frame()

Fix trac ticket #1116.

7 years agolavfi/aresample: print channel layouts and formats along with the rate.
Clément Bœsch [Thu, 24 May 2012 22:07:40 +0000 (00:07 +0200)]
lavfi/aresample: print channel layouts and formats along with the rate.

7 years agoFixed warnings about int64 to int32 conversion
Michael Bradshaw [Wed, 16 May 2012 17:39:20 +0000 (11:39 -0600)]
Fixed warnings about int64 to int32 conversion

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 24 May 2012 22:38:16 +0000 (00:38 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: Return a proper error code instead of -1
  rtmp: Check malloc calls
  rtmp: Check ff_rtmp_packet_create calls
  lavfi: add audio mix filter
  flvdec: Make sure sample_rate is set to the updated value
  tqi: Pass errors from the MB decoder

Conflicts:
Changelog
doc/filters.texi
libavcodec/eatqi.c
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: move "aformat" before "amerge".
Clément Bœsch [Thu, 24 May 2012 21:55:17 +0000 (23:55 +0200)]
doc/filters: move "aformat" before "amerge".

7 years agodoc/filters: remove old aformat entry.
Clément Bœsch [Thu, 24 May 2012 21:54:04 +0000 (23:54 +0200)]
doc/filters: remove old aformat entry.

The new description is still available below.

7 years agoffplay: force exit when filter configuration fails
Marton Balint [Mon, 21 May 2012 22:10:03 +0000 (00:10 +0200)]
ffplay: force exit when filter configuration fails

Switching to visualization instead of exiting ffplay is a bit more tricky, so
just exit for now.

Fixes ticket 38.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: fix stream cycling if audio decoding fails
Marton Balint [Mon, 21 May 2012 21:33:41 +0000 (23:33 +0200)]
ffplay: fix stream cycling if audio decoding fails

Fixes ticket 1161.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: flush codec buffers before freeing filters
Marton Balint [Thu, 24 May 2012 21:22:59 +0000 (23:22 +0200)]
ffplay: flush codec buffers before freeing filters

We do this to ensure that input_get_buffer is not called from a
frame_worker_thread of a multithreaded decoder when we already freed the
filters.

Fixes occasional segfaults on video stream change.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: dont destroy packet queues on stream change
Marton Balint [Wed, 23 May 2012 23:56:28 +0000 (01:56 +0200)]
ffplay: dont destroy packet queues on stream change

This fixes occasional segfaults caused by lock request of the packet queue from
the reader thread.

Also don't allow to put frames into the queue when it's aborted, and don't try
to fill the queue with frames when it is aborted.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agolavfi/video: add avfilter.h include to fix make checkheaders.
Clément Bœsch [Thu, 24 May 2012 21:46:15 +0000 (23:46 +0200)]
lavfi/video: add avfilter.h include to fix make checkheaders.

7 years agoffmpeg: use AUTO_INSERT_FILTER() for -async option.
Clément Bœsch [Sat, 19 May 2012 18:08:25 +0000 (20:08 +0200)]
ffmpeg: use AUTO_INSERT_FILTER() for -async option.

7 years agoChangelog: update for 0.11
Michael Niedermayer [Thu, 24 May 2012 19:27:01 +0000 (21:27 +0200)]
Changelog: update for 0.11

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agortmp: Pass the proper return code in rtmp_handshake
Samuel Pitoiset [Thu, 24 May 2012 11:48:42 +0000 (13:48 +0200)]
rtmp: Pass the proper return code in rtmp_handshake

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortmp: Check return codes of net IO operations
Samuel Pitoiset [Thu, 24 May 2012 11:48:25 +0000 (13:48 +0200)]
rtmp: Check return codes of net IO operations

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoMAINTAINERS: update versions
Michael Niedermayer [Thu, 24 May 2012 19:15:01 +0000 (21:15 +0200)]
MAINTAINERS: update versions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: remove ffmpeg-mt-authorship.txt from master (for upcoming 0.11)
Michael Niedermayer [Thu, 24 May 2012 19:07:14 +0000 (21:07 +0200)]
doc: remove ffmpeg-mt-authorship.txt from master (for upcoming 0.11)

This lists git history, which is better kept in the history itself
that is both ours as this file as well as the actual history of the
ffmpeg-mt project.
If someone thinks this is not ok, drop me a mail and ill put it back!

Also note this file was not carried in our previous release with noone
complaining

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: set base in dr1 allocation.
Michael Niedermayer [Thu, 24 May 2012 16:40:49 +0000 (18:40 +0200)]
ffplay: set base in dr1 allocation.

This matches the default non dr1 allocator

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>