ffmpeg.git
8 years agoswscale: Merge a hunk from qatar that seems to have been forgotten or lost.
Michael Niedermayer [Wed, 21 Mar 2012 14:14:42 +0000 (15:14 +0100)]
swscale: Merge a hunk from qatar that seems to have been forgotten or lost.

Author of the code from qatar is Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi/ass: add dar option
Stefano Sabatini [Mon, 19 Mar 2012 18:28:56 +0000 (19:28 +0100)]
lavfi/ass: add dar option

Allow to specify the display aspect ratio adopted for rendering
subtitles.

8 years agolavfi/ass: use a default DAR value of 1.0
Stefano Sabatini [Wed, 21 Mar 2012 13:54:08 +0000 (14:54 +0100)]
lavfi/ass: use a default DAR value of 1.0

Previously it was using the same value of the input video DAR, which is
inconsistent with most implementations.

Fix trac ticket #1098.

8 years agolavfi/aspect: check for a negative code from av_parse_ratio()
Stefano Sabatini [Wed, 21 Mar 2012 13:39:24 +0000 (14:39 +0100)]
lavfi/aspect: check for a negative code from av_parse_ratio()

Check on < 0 rather than on != 0, this is more correct as a positive
error code from av_parse_ratio() value doesn't mean an error.

8 years agographdump: use av_bprintf API.
Nicolas George [Wed, 1 Feb 2012 20:33:39 +0000 (21:33 +0100)]
graphdump: use av_bprintf API.

8 years agolavu: add av_bprintf and related.
Nicolas George [Wed, 1 Feb 2012 19:37:50 +0000 (20:37 +0100)]
lavu: add av_bprintf and related.

8 years agobink: no need to increase width twice
Paul B Mahol [Wed, 21 Mar 2012 01:41:50 +0000 (01:41 +0000)]
bink: no need to increase width twice

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agozerocodec: factorize loop
Michael Niedermayer [Wed, 21 Mar 2012 02:29:30 +0000 (03:29 +0100)]
zerocodec: factorize loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agottadec: refactor ttafilter_process()
Paul B Mahol [Wed, 21 Mar 2012 00:31:25 +0000 (00:31 +0000)]
ttadec: refactor ttafilter_process()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotgq: use bytestream2_get_bytes_left()
Paul B Mahol [Wed, 21 Mar 2012 00:10:22 +0000 (00:10 +0000)]
tgq: use bytestream2_get_bytes_left()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoxxan: use bytestream2_size()
Paul B Mahol [Wed, 21 Mar 2012 00:10:21 +0000 (00:10 +0000)]
xxan: use bytestream2_size()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoxxan: remove write-only variable
Paul B Mahol [Wed, 21 Mar 2012 00:10:20 +0000 (00:10 +0000)]
xxan: remove write-only variable

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosmc: use bytestream2_size()
Paul B Mahol [Wed, 21 Mar 2012 00:10:19 +0000 (00:10 +0000)]
smc: use bytestream2_size()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobytestream: add functions for accessing size of buffer
Paul B Mahol [Wed, 21 Mar 2012 00:10:18 +0000 (00:10 +0000)]
bytestream: add functions for accessing size of buffer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocdxl: swap CHUNKY and BYTE_PLANAR
Paul B Mahol [Tue, 20 Mar 2012 23:59:26 +0000 (23:59 +0000)]
cdxl: swap CHUNKY and BYTE_PLANAR

This is how it is defined in Amiga Developer CD from year 1992 and
is consistent with files created with ADPro.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosgienc: fix packet size.
Michael Niedermayer [Wed, 21 Mar 2012 01:54:49 +0000 (02:54 +0100)]
sgienc: fix packet size.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 20 Mar 2012 23:15:18 +0000 (00:15 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (27 commits)
  avconv: free packet in write_frame() when discarding due to frame number limit
  FATE: use +/- flag option syntax for vp8 emu-edge tests
  lavf: make av_interleave_packet_per_dts() private.
  lavf: deprecate av_read_packet().
  oggdec: output correct timestamps for Vorbis
  avconv: pass input stream timestamps to audio encoders
  lavc: shrink encoded audio packet size after encoding.
  xa: set correct bit rate
  xa: do not set bit_rate, block_align, or bits_per_coded_sample
  xa: fix end-of-file handling
  xa: fix timestamp calculation
  bink: fix typo in FFALIGN() argument
  bink: align plane width to 8 when calculating bundle sizes
  doc: pass -Idoc texi2html and texi2pod
  doc: texi2pod: add -I flag
  movenc: Add a min_frag_duration option
  rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers
  libavformat: Set the default for the max_delay option to -1
  Generate manpages for AV{Format,Codec}Context AVOptions.
  doc/avconv: remove entries for AVOptions.
  ...

Conflicts:
doc/Makefile
doc/ffmpeg.texi
doc/muxers.texi
ffmpeg.c
libavcodec/Makefile
libavcodec/options.c
libavcodec/vp8.c
libavformat/options.c
tests/fate/demux.mak
tests/ref/fate/truemotion1-15
tests/ref/fate/truemotion1-24

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofate/zerocodec: fix permissions
Michael Niedermayer [Tue, 20 Mar 2012 20:21:14 +0000 (21:21 +0100)]
fate/zerocodec: fix permissions

Reported-by: Deamon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavconv: free packet in write_frame() when discarding due to frame number limit
Justin Ruggles [Tue, 20 Mar 2012 19:36:28 +0000 (15:36 -0400)]
avconv: free packet in write_frame() when discarding due to frame number limit

Fixes a memleak when using the -frames option with audio.

8 years agoFATE: use +/- flag option syntax for vp8 emu-edge tests
Justin Ruggles [Tue, 20 Mar 2012 19:10:39 +0000 (15:10 -0400)]
FATE: use +/- flag option syntax for vp8 emu-edge tests

8 years agopngenc: Fix incorrect mask used for interlaced mode.
Michael Niedermayer [Tue, 20 Mar 2012 19:39:32 +0000 (20:39 +0100)]
pngenc: Fix incorrect mask used for interlaced mode.

Fixes Ticket1109

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavf: make av_interleave_packet_per_dts() private.
Anton Khirnov [Thu, 15 Mar 2012 12:37:43 +0000 (13:37 +0100)]
lavf: make av_interleave_packet_per_dts() private.

There is no reason for it to be public, it's only meant to be used
internally.

8 years agolavf: deprecate av_read_packet().
Anton Khirnov [Sun, 4 Mar 2012 20:41:59 +0000 (21:41 +0100)]
lavf: deprecate av_read_packet().

The caller can achieve the same effect (i.e. getting raw unparsed/mangled
packets) with av_read_frame() and AVFMT_FLAG_NOPARSE |
AVFMT_FLAG_NOFILLIN

8 years agooggdec: output correct timestamps for Vorbis
Justin Ruggles [Fri, 24 Feb 2012 02:40:14 +0000 (21:40 -0500)]
oggdec: output correct timestamps for Vorbis

Takes encoder delay into account by comparing first the coded page
duration with the calculated page duration. Handles last packet duration
if needed, also by comparing coded duration with calculated duration.
Also does better handling of timestamp generation for packets in the
first page for streamed ogg files where the start time is not
necessarily zero.

8 years agoavconv: pass input stream timestamps to audio encoders
Justin Ruggles [Thu, 1 Mar 2012 18:02:49 +0000 (13:02 -0500)]
avconv: pass input stream timestamps to audio encoders

5 FATE test references updated due to using demuxer-generated timestamps that
are either not sample-accurate or are slightly off in the input file.

8 years agolavc: shrink encoded audio packet size after encoding.
Justin Ruggles [Tue, 20 Mar 2012 17:21:52 +0000 (13:21 -0400)]
lavc: shrink encoded audio packet size after encoding.

8 years agoxa: set correct bit rate
Justin Ruggles [Tue, 20 Mar 2012 16:13:15 +0000 (12:13 -0400)]
xa: set correct bit rate

Also fixes stream duration calculation.

8 years agoxa: do not set bit_rate, block_align, or bits_per_coded_sample
Justin Ruggles [Tue, 20 Mar 2012 16:00:00 +0000 (12:00 -0400)]
xa: do not set bit_rate, block_align, or bits_per_coded_sample

The values in the header refer to decoded data, not compressed data.

8 years agoxa: fix end-of-file handling
Justin Ruggles [Tue, 20 Mar 2012 15:53:56 +0000 (11:53 -0400)]
xa: fix end-of-file handling

Do not output an extra packet when out_size is reached.
Also return AVERROR_EOF instead of AVERROR(EIO).

8 years agoxa: fix timestamp calculation
Justin Ruggles [Tue, 20 Mar 2012 15:20:54 +0000 (11:20 -0400)]
xa: fix timestamp calculation

The packet duration is always 28 samples.

8 years agobink: fix typo in FFALIGN() argument
Kostya Shishkov [Tue, 20 Mar 2012 17:43:00 +0000 (18:43 +0100)]
bink: fix typo in FFALIGN() argument

8 years agobink: align plane width to 8 when calculating bundle sizes
Kostya Shishkov [Tue, 20 Mar 2012 06:53:41 +0000 (07:53 +0100)]
bink: align plane width to 8 when calculating bundle sizes

This fixes decoding of Bink files with non-multiple-of-16 width.

8 years agopngdec: print error message for truncated pngs even if we output them
Michael Niedermayer [Tue, 20 Mar 2012 13:13:01 +0000 (14:13 +0100)]
pngdec: print error message for truncated pngs even if we output them

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopngenc: allocate packets that have some chance of being large enough.
Michael Niedermayer [Tue, 20 Mar 2012 13:12:16 +0000 (14:12 +0100)]
pngenc: allocate packets that have some chance of being large enough.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomxfdec: Only parse next partition pack if parsing forward
Tomas Härdin [Tue, 20 Mar 2012 10:03:48 +0000 (11:03 +0100)]
mxfdec: Only parse next partition pack if parsing forward

This fixes ticket #1099.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopngdec: dont discard incomplete images.
Michael Niedermayer [Tue, 20 Mar 2012 12:27:37 +0000 (13:27 +0100)]
pngdec: dont discard incomplete images.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopngdec: Print error messages for the various failure pathes.
Michael Niedermayer [Tue, 20 Mar 2012 12:22:40 +0000 (13:22 +0100)]
pngdec: Print error messages for the various failure pathes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodoc: pass -Idoc texi2html and texi2pod
Mans Rullgard [Tue, 20 Mar 2012 10:54:02 +0000 (10:54 +0000)]
doc: pass -Idoc texi2html and texi2pod

This fixes doc generation in build tree separate from source.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agodoc: texi2pod: add -I flag
Mans Rullgard [Tue, 20 Mar 2012 10:53:06 +0000 (10:53 +0000)]
doc: texi2pod: add -I flag

This allows specifying additional directories to search for
@include files.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agomovenc: Add a min_frag_duration option
Martin Storsjö [Mon, 19 Mar 2012 17:31:15 +0000 (19:31 +0200)]
movenc: Add a min_frag_duration option

The other fragmentation options (frag_duration, frag_size and
frag_keyframe) are combined with OR, cutting fragments at the
first of the conditions being fulfilled.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers
Martin Storsjö [Mon, 19 Mar 2012 18:40:23 +0000 (20:40 +0200)]
rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers

This enables reordering of UDP packets by default, unless the caller
explicitly sets -max_delay 0.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolibavformat: Set the default for the max_delay option to -1
Martin Storsjö [Mon, 19 Mar 2012 18:37:10 +0000 (20:37 +0200)]
libavformat: Set the default for the max_delay option to -1

Make the muxers/demuxers that use the field handle the default
-1 in the same way as 0.

This allows distinguishing an intentionally set 0 from the default
value where the user hasn't set it.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoflv: clarify use of video info/cmd frame.
Clément Bœsch [Mon, 19 Mar 2012 13:49:04 +0000 (14:49 +0100)]
flv: clarify use of video info/cmd frame.

Also add generated key frame in the enum, and doxycomment the existing
ones. Descriptions are directly taken from the public specifications.

8 years agoGenerate manpages for AV{Format,Codec}Context AVOptions.
Anton Khirnov [Wed, 14 Mar 2012 19:08:50 +0000 (20:08 +0100)]
Generate manpages for AV{Format,Codec}Context AVOptions.

8 years agodoc/avconv: remove entries for AVOptions.
Anton Khirnov [Thu, 15 Mar 2012 07:17:05 +0000 (08:17 +0100)]
doc/avconv: remove entries for AVOptions.

Documentation for those will be generated automatically.

8 years agoMove AVFormatContext/AVCodecContext option tables to separate files.
Anton Khirnov [Wed, 14 Mar 2012 12:18:20 +0000 (13:18 +0100)]
Move AVFormatContext/AVCodecContext option tables to separate files.

This will allow us to automatically generate manpages for them.

8 years agolavf: use AVStream.discard to disable queueing attached pictures.
Anton Khirnov [Sun, 18 Mar 2012 16:35:49 +0000 (17:35 +0100)]
lavf: use AVStream.discard to disable queueing attached pictures.

8 years agolavf: requeue attached pictures after seeking.
Anton Khirnov [Sun, 18 Mar 2012 16:34:14 +0000 (17:34 +0100)]
lavf: requeue attached pictures after seeking.

This allows the caller to get them without special code even after
seeking before receiving any data.

8 years agoid3v2: set the keyframe flag on attached pictures.
Anton Khirnov [Sun, 18 Mar 2012 16:29:52 +0000 (17:29 +0100)]
id3v2: set the keyframe flag on attached pictures.

8 years agozerocodec: Fix license
Derek Buitenhuis [Mon, 19 Mar 2012 22:06:48 +0000 (18:06 -0400)]
zerocodec: Fix license

ISC doesn't contain this line, so remove it to
prevent confusion.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFATE: Add ZeroCodec test
Derek Buitenhuis [Mon, 19 Mar 2012 22:33:15 +0000 (18:33 -0400)]
FATE: Add ZeroCodec test

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffv1enc: Check context_model
Michael Niedermayer [Mon, 19 Mar 2012 23:29:34 +0000 (00:29 +0100)]
ffv1enc: Check context_model

Fixes crash

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 19 Mar 2012 22:40:03 +0000 (23:40 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (35 commits)
  fix space type in Changelog
  ZeroCodec Decoder
  RealAudio Lossless decoder
  rtpenc: Use AVFormatContext.packet_size instead of a private option
  url: Document the expected behaviour of url_read
  libavformat: Use AVFormatContext.probesize in init_input
  docs: Fix a stray reference to tags in the generic doxy on dicts
  cosmetics: Align some AVInput/OutputFormat declarations
  zmbv: check decompress result
  zmbv: correct indentation
  adpcm: convert adpcm_thp to bytestream2.
  adpcm: convert adpcm_yamaha to bytestream2.
  adpcm: convert adpcm_swf to bytestream2.
  adpcm: convert adpcm_sbpro to bytestream2.
  adpcm: convert adpcm_ct to bytestream2.
  adpcm: convert adpcm_ima_amv/smjpeg to bytestream2.
  adpcm: convert adpcm_ea_xas to bytestream2.
  adpcm: convert adpcm_ea_r1/2/3 to bytestream2.
  adpcm: convert ea_maxis_xa to bytestream2.
  adpcm: convert adpcm_ea to bytestream2.
  ...

Conflicts:
Changelog
libavcodec/Makefile
libavcodec/adpcm.c
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/version.h
libavcodec/zerocodec.c
libavcodec/zmbv.c
libavformat/riff.c
libavformat/url.h
tests/ref/fate/truemotion1-15
tests/ref/fate/truemotion1-24

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosnowenc: move runs from stack to heap.
Michael Niedermayer [Mon, 19 Mar 2012 21:37:06 +0000 (22:37 +0100)]
snowenc: move runs from stack to heap.

Fixes ticket1082

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavcodec_encode_audio2: Increase the audio buffer size.
Michael Niedermayer [Mon, 19 Mar 2012 21:20:04 +0000 (22:20 +0100)]
avcodec_encode_audio2: Increase the audio buffer size.

Fixes Ticket1104

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFATE: change fate-maxis-xa to a normal demuxing test
Paul B Mahol [Sun, 18 Mar 2012 21:04:08 +0000 (21:04 +0000)]
FATE: change fate-maxis-xa to a normal demuxing test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agoFATE: add test for adpcm-ea-maxis-xa
Paul B Mahol [Sun, 18 Mar 2012 19:50:20 +0000 (19:50 +0000)]
FATE: add test for adpcm-ea-maxis-xa

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agovp8: avoid race condition on segment map.
Aaron Colwell [Mon, 19 Mar 2012 03:03:00 +0000 (20:03 -0700)]
vp8: avoid race condition on segment map.

This change avoids accessing the segment map of the previous frame if
segmentation is not enabled for the current frame. The caller of
decode_mb_mode() only calls ff_thread_await_progress() on the reference
segmentation index array if segmentation is enabled, so Chromium's TSAN
will report a race when accessing this data while segmentation is not
enabled.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agomp3_probe: consider id3 tags to be low scoring mp3.
Michael Niedermayer [Mon, 19 Mar 2012 19:41:34 +0000 (20:41 +0100)]
mp3_probe: consider id3 tags to be low scoring mp3.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi/aspect: fail with AVERROR(EINVAL) in case of invalid specified aspect
Stefano Sabatini [Mon, 19 Mar 2012 19:06:06 +0000 (20:06 +0100)]
lavfi/aspect: fail with AVERROR(EINVAL) in case of invalid specified aspect

Previously it was returning 0 in case the aspect was parsable but
invalid.

X-ColaCount: +10*PHIl

8 years agofix space type in Changelog
Kostya Shishkov [Mon, 19 Mar 2012 18:11:24 +0000 (19:11 +0100)]
fix space type in Changelog

8 years agoZeroCodec Decoder
Derek Buitenhuis [Sun, 18 Mar 2012 19:04:38 +0000 (15:04 -0400)]
ZeroCodec Decoder

An obscure Japanese lossless video codec, originally intended
for use with a remote desktop application.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
8 years agolavc/sunrastenc: consider cases with linesize < 0
Stefano Sabatini [Sun, 18 Mar 2012 15:55:53 +0000 (16:55 +0100)]
lavc/sunrastenc: consider cases with linesize < 0

Make sunrast_image_write_image() deal with cases when linesize is < 0.
Fix trac ticket #1077.

8 years agoRealAudio Lossless decoder
Kostya Shishkov [Sat, 17 Mar 2012 07:48:57 +0000 (08:48 +0100)]
RealAudio Lossless decoder

8 years agortpenc: Use AVFormatContext.packet_size instead of a private option
Martin Storsjö [Mon, 19 Mar 2012 11:56:25 +0000 (13:56 +0200)]
rtpenc: Use AVFormatContext.packet_size instead of a private option

The private option has not been part of any release yet (and
it is only of use in quite rare cases), so just remove it instead
of keeping it with deprecation warnings.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agourl: Document the expected behaviour of url_read
Nicolas George [Thu, 15 Mar 2012 11:16:54 +0000 (12:16 +0100)]
url: Document the expected behaviour of url_read

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolibavformat: Use AVFormatContext.probesize in init_input
Martin Storsjö [Mon, 19 Mar 2012 12:24:04 +0000 (14:24 +0200)]
libavformat: Use AVFormatContext.probesize in init_input

This was forgotten in the transition from av_open_input_file to
avformat_open_input, see 603b8bc2a1.

This doesn't change anything for the default case where the
option isn't set, since PROBE_BUF_MAX is 1048576 (which was
used as max probe size earlier) while the default value for
the probesize option is 5000000, which for the probe function
is clipped to PROBE_BUF_MAX anyway.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agodocs: Fix a stray reference to tags in the generic doxy on dicts
Martin Storsjö [Mon, 19 Mar 2012 12:21:52 +0000 (14:21 +0200)]
docs: Fix a stray reference to tags in the generic doxy on dicts

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agogxf: return AVERROR_EOF instead of AVERROR(EIO) at end of gxf_packet function
Matthieu Bouron [Sat, 17 Mar 2012 09:59:11 +0000 (10:59 +0100)]
gxf: return AVERROR_EOF instead of AVERROR(EIO) at end of gxf_packet function

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocosmetics: Align some AVInput/OutputFormat declarations
Martin Storsjö [Mon, 19 Mar 2012 10:17:47 +0000 (12:17 +0200)]
cosmetics: Align some AVInput/OutputFormat declarations

Also add missing trailing commas.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoTell users about supported audio samplerates in mmf.
Carl Eugen Hoyos [Mon, 19 Mar 2012 09:09:04 +0000 (10:09 +0100)]
Tell users about supported audio samplerates in mmf.

8 years agoMatch documentation for transparency in BGR32 iff images.
Carl Eugen Hoyos [Mon, 19 Mar 2012 08:49:33 +0000 (09:49 +0100)]
Match documentation for transparency in BGR32 iff images.

8 years agozmbv: check decompress result
Kostya Shishkov [Sun, 18 Mar 2012 08:11:39 +0000 (09:11 +0100)]
zmbv: check decompress result

Changing flush type from Z_FINISH is needed since encoder compresses fixed
amount of data and doesn't care about writing end of stream marker.

8 years agozmbv: correct indentation
Kostya Shishkov [Sun, 18 Mar 2012 07:48:50 +0000 (08:48 +0100)]
zmbv: correct indentation

8 years agoh264: print the pps_id when its invalid.
Michael Niedermayer [Mon, 19 Mar 2012 00:43:44 +0000 (01:43 +0100)]
h264: print the pps_id when its invalid.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoZeroCodec Decoder
Derek Buitenhuis [Sun, 18 Mar 2012 17:00:18 +0000 (13:00 -0400)]
ZeroCodec Decoder

An obscure Japanese lossless video codec, originally intended
for use with a remote desktop application.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 18 Mar 2012 22:12:35 +0000 (23:12 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: make compare() function compatible with POSIX bc
  Update Janne's email address.
  APIchanges: Replace Subversion revision numbers by Git hashes.
  bytestream: Eliminate one level of pointless macro indirection.
  xwd: convert to bytestream2.
  vqavideo: port to bytestream2 API
  Read preset files with suffix .avpreset
  prores: allow user to set fixed quantiser
  lavf: remove some disabled code.
  lavf: only set average frame rate for video.
  lavf: remove a pointless check.
  avcodec: add XBM encoder

Conflicts:
Changelog
cmdutils.c
cmdutils.h
doc/APIchanges
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/version.h
libavcodec/vqavideo.c
libavformat/img2enc.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoadpcm: convert adpcm_thp to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:43:06 +0000 (15:43 -0700)]
adpcm: convert adpcm_thp to bytestream2.

8 years agoadpcm: convert adpcm_yamaha to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:39:16 +0000 (15:39 -0700)]
adpcm: convert adpcm_yamaha to bytestream2.

8 years agoadpcm: convert adpcm_swf to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:38:49 +0000 (15:38 -0700)]
adpcm: convert adpcm_swf to bytestream2.

8 years agoadpcm: convert adpcm_sbpro to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:38:10 +0000 (15:38 -0700)]
adpcm: convert adpcm_sbpro to bytestream2.

8 years agoadpcm: convert adpcm_ct to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:33:43 +0000 (15:33 -0700)]
adpcm: convert adpcm_ct to bytestream2.

8 years agoadpcm: convert adpcm_ima_amv/smjpeg to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:32:57 +0000 (15:32 -0700)]
adpcm: convert adpcm_ima_amv/smjpeg to bytestream2.

8 years agoadpcm: convert adpcm_ea_xas to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:25:03 +0000 (15:25 -0700)]
adpcm: convert adpcm_ea_xas to bytestream2.

8 years agoadpcm: convert adpcm_ea_r1/2/3 to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 22:07:03 +0000 (15:07 -0700)]
adpcm: convert adpcm_ea_r1/2/3 to bytestream2.

8 years agoadpcm: convert ea_maxis_xa to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 21:54:18 +0000 (14:54 -0700)]
adpcm: convert ea_maxis_xa to bytestream2.

8 years agoadpcm: convert adpcm_ea to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 21:43:20 +0000 (14:43 -0700)]
adpcm: convert adpcm_ea to bytestream2.

8 years agoadpcm convert adpcm_ima_ea_sead to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 21:35:26 +0000 (14:35 -0700)]
adpcm convert adpcm_ima_ea_sead to bytestream2.

8 years agoadpcm: convert adpcm_ima_ea_eacs to bytestream2.
Ronald S. Bultje [Sun, 18 Mar 2012 00:06:39 +0000 (17:06 -0700)]
adpcm: convert adpcm_ima_ea_eacs to bytestream2.

8 years agoadpcm: convert adpcm_xa to bytestream2.
Ronald S. Bultje [Sun, 18 Mar 2012 00:06:14 +0000 (17:06 -0700)]
adpcm: convert adpcm_xa to bytestream2.

8 years agoadpcm: convert ima_ws to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 21:17:48 +0000 (14:17 -0700)]
adpcm: convert ima_ws to bytestream2.

8 years agoadpcm: convert adpcm_ima_apc to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 21:07:20 +0000 (14:07 -0700)]
adpcm: convert adpcm_ima_apc to bytestream2.

8 years agoadpcm: convert adpcm_ima_iss to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 20:42:17 +0000 (13:42 -0700)]
adpcm: convert adpcm_ima_iss to bytestream2.

8 years agoadpcm: convert adpcm_dk3 to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 20:39:54 +0000 (13:39 -0700)]
adpcm: convert adpcm_dk3 to bytestream2.

8 years agoadpcm: convert adpcm_dk4 to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 20:10:19 +0000 (13:10 -0700)]
adpcm: convert adpcm_dk4 to bytestream2.

8 years agoadpcm: convert adpcm_ms to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 20:04:12 +0000 (13:04 -0700)]
adpcm: convert adpcm_ms to bytestream2.

8 years agoadpcm: use av_clip() in adpcm_ima_expand_nibble().
Ronald S. Bultje [Sat, 17 Mar 2012 19:58:03 +0000 (12:58 -0700)]
adpcm: use av_clip() in adpcm_ima_expand_nibble().

8 years agoadpcm: convert adpcm_4xm to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 19:55:07 +0000 (12:55 -0700)]
adpcm: convert adpcm_4xm to bytestream2.

8 years agoadpcm: convert adpcm_ima_wav to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 19:51:59 +0000 (12:51 -0700)]
adpcm: convert adpcm_ima_wav to bytestream2.

8 years agoadpcm: convert adpcm_ima_qt to bytestream2.
Ronald S. Bultje [Sat, 17 Mar 2012 19:45:09 +0000 (12:45 -0700)]
adpcm: convert adpcm_ima_qt to bytestream2.