ffmpeg.git
8 years agonsvdec: Fix use of uninitialized streams.
Michael Niedermayer [Tue, 24 Jan 2012 21:20:26 +0000 (22:20 +0100)]
nsvdec: Fix use of uninitialized streams.

Fixes CVE-2011-3940 (Out of bounds read resulting in out of bounds write)

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix multi-channel encoding with libfaac.
Carl Eugen Hoyos [Wed, 25 Jan 2012 02:51:49 +0000 (03:51 +0100)]
Fix multi-channel encoding with libfaac.

8 years agobuildsystem: 10l add v4l entry back
Michael Niedermayer [Tue, 24 Jan 2012 23:45:49 +0000 (00:45 +0100)]
buildsystem: 10l add v4l entry back

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agov4l: fix compilation
Michael Niedermayer [Tue, 24 Jan 2012 23:12:22 +0000 (00:12 +0100)]
v4l: fix compilation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 24 Jan 2012 21:53:59 +0000 (22:53 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (23 commits)
  aacenc: Fix identification padding when the bitstream is already aligned.
  aacenc: Write correct length for long identification strings.
  aud: remove unneeded field, audio_stream_index from context
  aud: fix time stamp calculation for ADPCM IMA WS
  aud: simplify header parsing
  aud: set pts_wrap_bits to 64.
  cosmetics: indentation
  aud: support Westwood SND1 audio in AUD files.
  adpcm_ima_ws: fix stereo decoding
  avcodec: add a new codec_id for CRYO APC IMA ADPCM.
  vqa: remove unused context fields, audio_samplerate and audio_bits
  vqa: clean up audio header parsing
  vqa: set time base to frame rate as coded in the header.
  vqa: set packet duration.
  vqa: use 1/sample_rate as the audio stream time base
  vqa: set stream start_time to 0.
  lavc: postpone the removal of AVCodecContext.request_channels.
  lavf: postpone removing av_close_input_file().
  lavc: postpone removing old audio encoding and decoding API
  avplay: remove the -er option.
  ...

Conflicts:
Changelog
libavcodec/version.h
libavdevice/v4l.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAllow user to force reading mov alias from absolute path.
Carl Eugen Hoyos [Tue, 24 Jan 2012 21:39:54 +0000 (22:39 +0100)]
Allow user to force reading mov alias from absolute path.

Based on a work-around by Alex Zhukov.

Fixes ticket #935

8 years agoaacenc: Fix identification padding when the bitstream is already aligned.
Alex Converse [Mon, 23 Jan 2012 21:08:32 +0000 (13:08 -0800)]
aacenc: Fix identification padding when the bitstream is already aligned.

8 years agoaacenc: Write correct length for long identification strings.
Michael Niedermayer [Mon, 23 Jan 2012 21:05:03 +0000 (13:05 -0800)]
aacenc: Write correct length for long identification strings.

When the length is the escape value (15), the new length is calculated by
15 + get_bits(8) - 1.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoerror concealment: initialize block index.
Michael Niedermayer [Tue, 24 Jan 2012 19:54:27 +0000 (20:54 +0100)]
error concealment: initialize block index.

Fixes CVE-2011-3941 (out of bounds write)

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaud: remove unneeded field, audio_stream_index from context
Justin Ruggles [Tue, 24 Jan 2012 16:46:58 +0000 (11:46 -0500)]
aud: remove unneeded field, audio_stream_index from context

There is only one stream, so it will always be index 0.
This also allows for removal of the private context.

8 years agoaud: fix time stamp calculation for ADPCM IMA WS
Justin Ruggles [Tue, 24 Jan 2012 16:43:54 +0000 (11:43 -0500)]
aud: fix time stamp calculation for ADPCM IMA WS

also allows for removing some unused context fields

8 years agoaud: simplify header parsing
Justin Ruggles [Tue, 24 Jan 2012 16:40:23 +0000 (11:40 -0500)]
aud: simplify header parsing

also allows for removing some unused context fields

8 years agoaud: set pts_wrap_bits to 64.
Justin Ruggles [Tue, 24 Jan 2012 16:28:02 +0000 (11:28 -0500)]
aud: set pts_wrap_bits to 64.

Time stamps are not read from the bitstream, so no wrapping is needed.

8 years agocosmetics: indentation
Justin Ruggles [Tue, 24 Jan 2012 16:41:37 +0000 (11:41 -0500)]
cosmetics: indentation

8 years agoaud: support Westwood SND1 audio in AUD files.
Justin Ruggles [Tue, 24 Jan 2012 16:09:05 +0000 (11:09 -0500)]
aud: support Westwood SND1 audio in AUD files.

Fixes decoding of the handful of "death scream" samples from
"Command and Conquer" that use SND1. e.g.
http://samples.libav.org/game-formats/westwood-aud/nuyell1.aud
http://samples.libav.org/game-formats/westwood-aud/nuyell7.aud

8 years agoadpcm_ima_ws: fix stereo decoding
Justin Ruggles [Mon, 23 Jan 2012 17:23:27 +0000 (12:23 -0500)]
adpcm_ima_ws: fix stereo decoding

Stereo ADPCM IMA WS is planar for VQA version 3 and 2-sample interleaved for
VQA version 2.

8 years agoavcodec: add a new codec_id for CRYO APC IMA ADPCM.
Justin Ruggles [Mon, 23 Jan 2012 19:57:32 +0000 (14:57 -0500)]
avcodec: add a new codec_id for CRYO APC IMA ADPCM.

The stereo layout and extradata is significantly different from that in
Westwood IMA ADPCM, so a separate codec_id is warranted.

8 years agovqa: remove unused context fields, audio_samplerate and audio_bits
Justin Ruggles [Mon, 23 Jan 2012 18:43:54 +0000 (13:43 -0500)]
vqa: remove unused context fields, audio_samplerate and audio_bits

8 years agovqa: clean up audio header parsing
Justin Ruggles [Mon, 23 Jan 2012 18:28:20 +0000 (13:28 -0500)]
vqa: clean up audio header parsing

Fix setting of bit_rate and bits_per_coded_sample.
Ask for sample for unsupported VQA versions.

8 years agovqa: set time base to frame rate as coded in the header.
Justin Ruggles [Mon, 23 Jan 2012 16:38:00 +0000 (11:38 -0500)]
vqa: set time base to frame rate as coded in the header.

According to Multimedia Wiki documentation, the frame rate is not always 15,
and the actual value can be found in the header.

8 years agovqa: set packet duration.
Justin Ruggles [Mon, 23 Jan 2012 16:06:35 +0000 (11:06 -0500)]
vqa: set packet duration.

Also remove unused context field, audio_frame_counter.

8 years agovqa: use 1/sample_rate as the audio stream time base
Justin Ruggles [Mon, 23 Jan 2012 15:55:28 +0000 (10:55 -0500)]
vqa: use 1/sample_rate as the audio stream time base

8 years agovqa: set stream start_time to 0.
Justin Ruggles [Mon, 23 Jan 2012 15:52:49 +0000 (10:52 -0500)]
vqa: set stream start_time to 0.

The format has no coded timestamps and must use packet durations to generate
them.

8 years agolavc: postpone the removal of AVCodecContext.request_channels.
Anton Khirnov [Thu, 12 Jan 2012 10:16:38 +0000 (11:16 +0100)]
lavc: postpone the removal of AVCodecContext.request_channels.

Although it has been deprecated for a long time, its intended
replacement (request_channel_layout) is not actually used anywhere, so
request_channels is currently the only way to access that functionality.

8 years agolavf: postpone removing av_close_input_file().
Anton Khirnov [Sun, 22 Jan 2012 09:43:40 +0000 (10:43 +0100)]
lavf: postpone removing av_close_input_file().

It has been deprecated only recently.

8 years agolavc: postpone removing old audio encoding and decoding API
Anton Khirnov [Sun, 22 Jan 2012 09:43:40 +0000 (10:43 +0100)]
lavc: postpone removing old audio encoding and decoding API

It has been deprecated only recently.

8 years agoavplay: remove the -er option.
Anton Khirnov [Sun, 22 Jan 2012 09:51:26 +0000 (10:51 +0100)]
avplay: remove the -er option.

Error recognition flags can and should be set directly with AVOptions.

8 years agolavd: remove deprecated v4l grab device.
Anton Khirnov [Thu, 12 Jan 2012 10:22:59 +0000 (11:22 +0100)]
lavd: remove deprecated v4l grab device.

8 years agoMerge remote-tracking branch 'tjoppen/mxf_fixes_20120124'
Michael Niedermayer [Tue, 24 Jan 2012 16:15:48 +0000 (17:15 +0100)]
Merge remote-tracking branch 'tjoppen/mxf_fixes_20120124'

* tjoppen/mxf_fixes_20120124:
  mxfdec: Fix files > 2 GiB
  mxfdec: Handle small EditUnitByteCount

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAdded clockwise rotate values to metadata for 90 and 270 degrees
Piotr Tomasik [Tue, 24 Jan 2012 10:16:41 +0000 (02:16 -0800)]
Added clockwise rotate values to metadata for 90 and 270 degrees

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavf: replace remaining use of deprecated get_strz()
Paul B Mahol [Mon, 23 Jan 2012 18:49:25 +0000 (18:49 +0000)]
lavf: replace remaining use of deprecated get_strz()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws: Fix RGB0->alpha containing formats.
Michael Niedermayer [Sun, 22 Jan 2012 05:06:22 +0000 (06:06 +0100)]
sws: Fix RGB0->alpha containing formats.

Fixes Ticket869

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobuildsys: Fix shared lib build of ffserver.
Michael Niedermayer [Mon, 23 Jan 2012 00:48:09 +0000 (01:48 +0100)]
buildsys: Fix shared lib build of ffserver.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobuild: Allow building old API/ABI libpostproc version
Alexander Strasser [Tue, 24 Jan 2012 01:54:57 +0000 (02:54 +0100)]
build: Allow building old API/ABI libpostproc version

  Allows our users to still build against a libpostproc with the old
API/ABI. Distributions can use this option to defer the soname bump.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodoc: add Timecode documentation.
Clément Bœsch [Tue, 3 Jan 2012 09:47:42 +0000 (10:47 +0100)]
doc: add Timecode documentation.

8 years agomaintainers: add myself for recent works.
Nicolas George [Tue, 24 Jan 2012 14:51:09 +0000 (15:51 +0100)]
maintainers: add myself for recent works.

8 years agofaq: fix typo.
Nicolas George [Tue, 24 Jan 2012 15:03:09 +0000 (16:03 +0100)]
faq: fix typo.

Reported-By: Clément Bœsch
8 years agofaq: document af_aconvert quirks using lavfi.
Nicolas George [Tue, 24 Jan 2012 11:42:20 +0000 (12:42 +0100)]
faq: document af_aconvert quirks using lavfi.

8 years agoAdd myself as mxfdec maintainer
Tomas Härdin [Tue, 24 Jan 2012 13:13:57 +0000 (14:13 +0100)]
Add myself as mxfdec maintainer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264: Disallow w/h/pixfmt changes for frame threads.
Michael Niedermayer [Tue, 24 Jan 2012 05:21:45 +0000 (06:21 +0100)]
h264: Disallow w/h/pixfmt changes for frame threads.

Previously this was just checked in case of slice threads,
but frame threads do not support this either currently.

Making them support this is of course the long term goal

Fixes bug155

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegvideo: Draw edges based on the pictures linesize instead of the contexts.
Michael Niedermayer [Tue, 24 Jan 2012 00:30:28 +0000 (01:30 +0100)]
mpegvideo: Draw edges based on the pictures linesize instead of the contexts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: Allocate buffers of the size needed by the decoder.
Michael Niedermayer [Tue, 24 Jan 2012 00:29:03 +0000 (01:29 +0100)]
ffmpeg: Allocate buffers of the size needed by the decoder.

Fixes bug127

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibcelt: configure: distinguish not found and too old.
Nicolas George [Tue, 24 Jan 2012 12:21:34 +0000 (13:21 +0100)]
libcelt: configure: distinguish not found and too old.

Fixes ticket #940.

8 years agomxfdec: Fix files > 2 GiB
Tomas Härdin [Tue, 24 Jan 2012 11:24:24 +0000 (12:24 +0100)]
mxfdec: Fix files > 2 GiB

Accumulating into an int would cause overflow for files with essence
containers larger than 2 GiB.

8 years agolavfi: require libswr for af_pan.
Nicolas George [Tue, 24 Jan 2012 11:11:04 +0000 (12:11 +0100)]
lavfi: require libswr for af_pan.

8 years agolavd/lavfi: add dumpgraph option.
Nicolas George [Thu, 19 Jan 2012 18:38:11 +0000 (19:38 +0100)]
lavd/lavfi: add dumpgraph option.

8 years agolavfi: add avfilter_graph_dump.
Nicolas George [Thu, 19 Jan 2012 16:38:44 +0000 (17:38 +0100)]
lavfi: add avfilter_graph_dump.

8 years agomxfdec: Handle small EditUnitByteCount
Tomas Härdin [Tue, 24 Jan 2012 10:36:39 +0000 (11:36 +0100)]
mxfdec: Handle small EditUnitByteCount

These are common with audio atoms. Without this the demuxer would read two
bytes at a time for a mono 16-bit file.

8 years agopan: drop unecessary includes.
Clément Bœsch [Mon, 23 Jan 2012 10:30:10 +0000 (11:30 +0100)]
pan: drop unecessary includes.

8 years agopan: move query_formats() to avoid forward declarations.
Clément Bœsch [Mon, 23 Jan 2012 10:28:47 +0000 (11:28 +0100)]
pan: move query_formats() to avoid forward declarations.

8 years agopan: reindent after remap commit.
Clément Bœsch [Mon, 23 Jan 2012 10:27:11 +0000 (11:27 +0100)]
pan: reindent after remap commit.

8 years agopan: add channel mapping capability.
Clément Bœsch [Wed, 18 Jan 2012 11:00:16 +0000 (12:00 +0100)]
pan: add channel mapping capability.

8 years agopan: raise correct error when there is no param specified.
Clément Bœsch [Tue, 17 Jan 2012 10:01:37 +0000 (11:01 +0100)]
pan: raise correct error when there is no param specified.

8 years agoChangelog: restore version <next> header
Paul B Mahol [Mon, 23 Jan 2012 23:28:50 +0000 (23:28 +0000)]
Changelog: restore version <next> header

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 24 Jan 2012 01:41:53 +0000 (02:41 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Remove ffmpeg.
  aacenc: Simplify windowing
  aacenc: Move saved overlap samples to the beginning of the same buffer as incoming samples.
  aacenc: Deinterleave input samples before processing.
  aacenc: Store channel count in AACEncContext.
  aacenc: Move Q^3/4 calculation to it's own table
  aacenc: Request normalized float samples instead of converting s16 samples to float.
  aacpsy: Replace an if with FFMAX in LAME windowing.
  aacenc: cosmetics, replace 'rd' with 'bits' in codebook_trellis_rate to make it more clear what is being calculated.
  aacpsy: cosmetics, change a FIXME to a NOTE about subshort comparisons
  aacenc: cosmetics: move init() and end() to the bottom of the file.
  aacenc: aac_encode_init() cleanup
  XWD encoder and decoder
  vc1: don't read the interpfrm and bfraction elements for interlaced frames
  mxfdec: fix memleak on mxf_read_close()
  westwood: split the AUD and VQA demuxers into separate files.

Conflicts:
.gitignore
Changelog
Makefile
configure
doc/ffmpeg.texi
ffmpeg.c
libavcodec/Makefile
libavcodec/aacenc.c
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/version.h
libavformat/Makefile
libavformat/img2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRevert "Fix multi-channel AAC encoding."
Michael Niedermayer [Tue, 24 Jan 2012 01:31:56 +0000 (02:31 +0100)]
Revert "Fix multi-channel AAC encoding."

This reverts commit b3452771c4550b46ea54d15be6cfe8cc10585199.

A better solution was implemented by Nathan Caldwell.

Conflicts:

libavcodec/aacenc.c

8 years agorv10: verify slice offsets against buffer size
Janne Grunau [Mon, 23 Jan 2012 19:57:04 +0000 (20:57 +0100)]
rv10: verify slice offsets against buffer size

Found by John Villamil <johnv@matasano.com> in fuzzed rv20 in mkv files.

8 years agomovenc: Decrease default chunk merge limit to 1mb.
Michael Niedermayer [Mon, 23 Jan 2012 19:52:37 +0000 (20:52 +0100)]
movenc: Decrease default chunk merge limit to 1mb.

This reduces the delay when opening the video with quicktime.

Idea-by: Maksym Veremeyenko <verem@m1stereo.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRemove ffmpeg.
Anton Khirnov [Thu, 12 Jan 2012 10:12:15 +0000 (11:12 +0100)]
Remove ffmpeg.

8 years agolimit chunk size to 1GB
Maksym Veremeyenko [Mon, 23 Jan 2012 11:59:37 +0000 (13:59 +0200)]
limit chunk size to 1GB

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaacenc: Simplify windowing
Nathan Caldwell [Sat, 24 Dec 2011 00:36:15 +0000 (17:36 -0700)]
aacenc: Simplify windowing

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoaacenc: Move saved overlap samples to the beginning of the same buffer as incoming...
Nathan Caldwell [Sat, 24 Dec 2011 22:24:16 +0000 (15:24 -0700)]
aacenc: Move saved overlap samples to the beginning of the same buffer as incoming samples.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoaacenc: Deinterleave input samples before processing.
Nathan Caldwell [Thu, 15 Dec 2011 02:43:56 +0000 (19:43 -0700)]
aacenc: Deinterleave input samples before processing.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoaacenc: Store channel count in AACEncContext.
Nathan Caldwell [Wed, 7 Dec 2011 22:20:10 +0000 (15:20 -0700)]
aacenc: Store channel count in AACEncContext.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoaacenc: Move Q^3/4 calculation to it's own table
Nathan Caldwell [Fri, 6 Jan 2012 21:24:37 +0000 (14:24 -0700)]
aacenc: Move Q^3/4 calculation to it's own table

This should be moved to tablegen at some point.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoaacenc: Request normalized float samples instead of converting s16 samples to float.
Nathan Caldwell [Sun, 18 Dec 2011 01:45:55 +0000 (18:45 -0700)]
aacenc: Request normalized float samples instead of converting s16 samples to float.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoaacpsy: Replace an if with FFMAX in LAME windowing.
Nathan Caldwell [Sat, 7 Jan 2012 21:21:35 +0000 (14:21 -0700)]
aacpsy: Replace an if with FFMAX in LAME windowing.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoaacenc: cosmetics, replace 'rd' with 'bits' in codebook_trellis_rate to make it more...
Nathan Caldwell [Mon, 9 Jan 2012 01:38:39 +0000 (18:38 -0700)]
aacenc: cosmetics, replace 'rd' with 'bits' in codebook_trellis_rate to make it more clear what is being calculated.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoaacpsy: cosmetics, change a FIXME to a NOTE about subshort comparisons
Nathan Caldwell [Sat, 7 Jan 2012 21:16:10 +0000 (14:16 -0700)]
aacpsy: cosmetics, change a FIXME to a NOTE about subshort comparisons

Also fix a typo.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoaacenc: cosmetics: move init() and end() to the bottom of the file.
Nathan Caldwell [Thu, 15 Dec 2011 02:50:23 +0000 (19:50 -0700)]
aacenc: cosmetics: move init() and end() to the bottom of the file.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoaacenc: aac_encode_init() cleanup
Nathan Caldwell [Fri, 2 Dec 2011 22:08:55 +0000 (15:08 -0700)]
aacenc: aac_encode_init() cleanup

Macroify sanity checks and check return values of allocs and other functions.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agocafdec: fix regression introduced in c7579ad8e84c5
Paul B Mahol [Mon, 23 Jan 2012 18:53:22 +0000 (18:53 +0000)]
cafdec: fix regression introduced in c7579ad8e84c5

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavidec: Fix use of stream_index before validation of its range.
Michael Niedermayer [Mon, 23 Jan 2012 18:36:22 +0000 (19:36 +0100)]
avidec: Fix use of stream_index before validation of its range.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoImprove support for PGS subtitles.
David Mitchell [Thu, 19 Jan 2012 15:31:01 +0000 (07:31 -0800)]
Improve support for PGS subtitles.

The previous implementation assumed that a new picture would always
supersede the previous picture. Similarly, presentation segments
were assumed to pertain to the most-recently-read picture.

However, each presentation segment may refer to 0 or more pictures
by their ID. Picture IDs may repeat, and a repeated picture ID
indicates that the old picture for that ID is no longer needed
and may be discarded.

The new implementation allocates a buffer with one slot for each
possible picture ID (the picture ID is a 16-bit field) and
properly decodes presentation segments so that all relevant
pictures are output upon encountering a display segment.

Given that most PGS streams are unlikely to use more than a small
fraction of the available picture IDs, it would probably be better
to use a more memory-efficient data structure. I'm lazy though, so
I leave this to a more motivated individual.

I've tested the code with MKV files in VLC (a recent revision from
their git repo) and with HandBrake (a version that I hacked up to
use ffmpeg's PGS subtitle decoder).

Review-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopthreads: Generic progress lubrication support.
Michael Niedermayer [Mon, 23 Jan 2012 05:34:30 +0000 (06:34 +0100)]
pthreads: Generic progress lubrication support.

Fixes bug118, bug120 and bug125 at least

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopthreads: reset got_frames on flush.
Michael Niedermayer [Mon, 23 Jan 2012 02:39:59 +0000 (03:39 +0100)]
pthreads: reset got_frames on flush.

This fixes memory corruption when seeking in broken streams.
a random mpeg4 in nut file was used to debug.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoXWD encoder and decoder
Paul B Mahol [Sat, 21 Jan 2012 17:45:52 +0000 (17:45 +0000)]
XWD encoder and decoder

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
8 years agovc1: don't read the interpfrm and bfraction elements for interlaced frames
Hendrik Leppkes [Fri, 13 Jan 2012 17:41:21 +0000 (18:41 +0100)]
vc1: don't read the interpfrm and bfraction elements for interlaced frames

This matches the spec as well as the reference decoder, and fixes a bug
with interlaced frame decoding.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
8 years agomxfdec: fix memleak on mxf_read_close()
Janne Grunau [Sun, 22 Jan 2012 18:57:13 +0000 (19:57 +0100)]
mxfdec: fix memleak on mxf_read_close()

8 years agocafdec: replace deprecated get_strz()
Paul B Mahol [Mon, 23 Jan 2012 16:18:44 +0000 (17:18 +0100)]
cafdec: replace deprecated get_strz()

8 years agocafenc: replace deprecated av_dbl2int()
Paul B Mahol [Mon, 23 Jan 2012 16:18:13 +0000 (17:18 +0100)]
cafenc: replace deprecated av_dbl2int()

8 years agowestwood: split the AUD and VQA demuxers into separate files.
Justin Ruggles [Fri, 20 Jan 2012 18:56:51 +0000 (13:56 -0500)]
westwood: split the AUD and VQA demuxers into separate files.

They have no code in common.

8 years agolibavformat/libavformat.v: fix application name in comment
Michael Niedermayer [Mon, 23 Jan 2012 00:46:57 +0000 (01:46 +0100)]
libavformat/libavformat.v: fix application name in comment

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

* qatar/master: (25 commits)
  riff: fix invalid av_freep() calls on EOF in ff_read_riff_info
  pam: Fix a typo that broke writing and reading PAM files.
  mxfdec: fix memleak on av_realloc failures
  mxfdec: Do not parse slices or DeltaEntryArrays.
  mxfdec: hybrid demuxing/seeking solution
  mxfdec: Add Avid's essence element key.
  mfxdec: Separate mxf_essence_container_uls for audio and video.
  mxfdec: Compute packet offsets properly.
  mxfdec: Use MaterialPackage - Track - TrackID instead of the system_item hack.
  mxfdec: use av_dlog() for 'no corresponding source package found'
  mxfdec: Make mxf->partitions sorted by offset.
  mxfdec: parse ThisPartition
  mxfdec: Speed up metadata and index parsing.
  mxfdec: Make sure DataDefinition is consistent between material track and source track.
  mxfdec: add EssenceContainer UL found in 0001GL00.MXF.A1.mxf_opatom.mxf
  mxfdec: Add hack that adjusts the n_delta calculation when system items are present.
  mxfdec: Parse IndexTableSegments and convert them into AVIndexEntry arrays.
  mxfdec: Move FooterPartition to MXFContext and make sure it is never zero.
  mxfdec: check return value of avio_seek
  mxfdec: skip to end of structural sets
  ...

Conflicts:
configure
libavcodec/pnm.c
libavformat/mxfdec.c
libavformat/riff.c
libavformat/rtsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoCrystalHD: Back up extradata to allow decoder reinit to work.
Philip Langdale [Sun, 22 Jan 2012 21:47:00 +0000 (13:47 -0800)]
CrystalHD: Back up extradata to allow decoder reinit to work.

This was a regression that came in when I switched to using the
h.264 annex b filter all the time. As the filter modifies extradata,
its use violates the statelessness assumption that exists in the
'ffmpeg' command line tool, and maybe elsewhere. It assumes that
a docoder can be reinitalised and pointed to an existing stream and
get the same results.

For now, the only way to meet this requirement is to backup the
extradata.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoCrystalHD: Initialise variables to silence valgrind.
Philip Langdale [Sun, 22 Jan 2012 21:46:59 +0000 (13:46 -0800)]
CrystalHD: Initialise variables to silence valgrind.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRevert "movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs"
Michael Niedermayer [Sun, 22 Jan 2012 22:23:23 +0000 (23:23 +0100)]
Revert "movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs"

This reverts commit 8e8c51318c1fe4ae61de578f0823b88aa3fe8222.

Fixes Ticket873

Conflicts:

tests/ref/acodec/pcm_s16be
tests/ref/acodec/pcm_s24be
tests/ref/acodec/pcm_s32be
tests/ref/acodec/pcm_s8
tests/ref/lavf/mov

Approved-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobuild: Describe --nm and -ld options consistently
Alexander Strasser [Sun, 15 Jan 2012 12:53:33 +0000 (13:53 +0100)]
build: Describe --nm and -ld options consistently

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopthread: Change a signal to a broadcast as multiple threads
Michael Niedermayer [Sun, 22 Jan 2012 20:13:10 +0000 (21:13 +0100)]
pthread: Change a signal to a broadcast as multiple threads
have been seen waiting and deadlocking on it in bug125.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobase64: 10l endian fix.
Michael Niedermayer [Sun, 22 Jan 2012 22:04:20 +0000 (23:04 +0100)]
base64: 10l endian fix.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoriff: fix invalid av_freep() calls on EOF in ff_read_riff_info
Janne Grunau [Thu, 5 Jan 2012 19:15:53 +0000 (20:15 +0100)]
riff: fix invalid av_freep() calls on EOF in ff_read_riff_info

8 years agoavfilter: add some asserts() to check refcounts.
Michael Niedermayer [Sun, 22 Jan 2012 18:30:40 +0000 (19:30 +0100)]
avfilter: add some asserts() to check refcounts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopam: Fix a typo that broke writing and reading PAM files.
Carl Eugen Hoyos [Wed, 28 Dec 2011 04:54:59 +0000 (05:54 +0100)]
pam: Fix a typo that broke writing and reading PAM files.

Reported and reviewed by Derek Buitenhuis.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agobuild: Support selecting yasm-compatible assembler
Alexander Strasser [Sun, 15 Jan 2012 23:48:16 +0000 (00:48 +0100)]
build: Support selecting yasm-compatible assembler

  Makes it possible to select the name/path of the tool for compiling
the non-inline assembly code.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws: Fix unscaled >8bit planar chroma handling.
Michael Niedermayer [Sun, 22 Jan 2012 05:44:34 +0000 (06:44 +0100)]
sws: Fix unscaled >8bit planar chroma handling.

Fixes Ticket840

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomxfdec: fix memleak on av_realloc failures
Janne Grunau [Wed, 21 Dec 2011 19:12:24 +0000 (20:12 +0100)]
mxfdec: fix memleak on av_realloc failures

8 years agompeg12: fixed parsing in some mpeg2 streams
Hendrik Leppkes [Fri, 20 Jan 2012 15:46:58 +0000 (16:46 +0100)]
mpeg12: fixed parsing in some mpeg2 streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavc: fix FF_LOSS_COLORQUANT detection for gray8a->pal8
Michael Niedermayer [Wed, 18 Jan 2012 14:51:09 +0000 (15:51 +0100)]
lavc: fix FF_LOSS_COLORQUANT detection for gray8a->pal8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoExtract some duplicated code.
Reimar Döffinger [Sat, 21 Jan 2012 23:12:34 +0000 (00:12 +0100)]
Extract some duplicated code.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoRemove pointless and distracting ()
Reimar Döffinger [Sat, 21 Jan 2012 23:02:42 +0000 (00:02 +0100)]
Remove pointless and distracting ()

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>