ffmpeg.git
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 26 Jan 2012 00:52:29 +0000 (01:52 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (22 commits)
  wma: Clip WMA1 and WMA2 frame length to 11 bits.
  movenc: Don't require frame_size to be set for modes other than mov
  doc: Update APIchanges with info on muxer flushing
  movenc: Reindent a block
  tools: Remove some unnecessary #undefs.
  rv20: prevent calling ff_h263_decode_mba() with unset height/width
  tools: K&R reformatting cosmetics
  Ignore generated aviocat and ismindex tools.
  build: Automatically include architecture-specific library Makefile snippets.
  indeo5: prevent null pointer dereference on broken files
  pktdumper: Use usleep instead of sleep
  cosmetics: Remove some unnecessary block braces.
  Drop unnecessary prefix from *sink* variable and struct names.
  Add a tool for creating smooth streaming manifests
  movdec: Calculate an average bit rate for fragmented streams, too
  movenc: Write the sample rate instead of time scale in the stsd atom
  movenc: Add a separate ismv/isma (smooth streaming) muxer
  movenc: Allow the caller to decide on fragmentation
  libavformat: Add a flag for muxers that support write_packet(NULL) for flushing
  movenc: Add support for writing fragmented mov files
  ...

Conflicts:
Changelog
cmdutils.c
cmdutils.h
doc/APIchanges
ffmpeg.c
ffplay.c
libavfilter/Makefile
libavformat/Makefile
libavformat/avformat.h
libavformat/movenc.c
libavformat/movenc.h
libavformat/version.h
tools/graph2dot.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomjpegbdec: Fix incorrect bitstream buffer size.
Michael Niedermayer [Wed, 25 Jan 2012 22:55:21 +0000 (23:55 +0100)]
mjpegbdec: Fix incorrect bitstream buffer size.

Fixes CVE-2011-3947

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agor210, r10k and avrp encoder
Paul B Mahol [Wed, 25 Jan 2012 19:46:57 +0000 (19:46 +0000)]
r210, r10k and avrp encoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agokgv1dec: Increase offsets array size so it is large enough.
Michael Niedermayer [Wed, 25 Jan 2012 22:23:35 +0000 (23:23 +0100)]
kgv1dec: Increase offsets array size so it is large enough.

Fixes CVE-2011-3945

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/ffmpeg.texi
Michael Niedermayer [Wed, 25 Jan 2012 22:01:34 +0000 (23:01 +0100)]
doc/ffmpeg.texi

Merge changes from avconv.texi since the last merge into ffmpeg.texi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoremove avconv from Doxyfile
Lou Logan [Tue, 24 Jan 2012 23:22:54 +0000 (14:22 -0900)]
remove avconv from Doxyfile

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRemove avconv
Michael Niedermayer [Tue, 24 Jan 2012 20:55:47 +0000 (21:55 +0100)]
Remove avconv

All features have been merged into ffmpeg.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosmackerdec: Check that the last indexes are within the table.
Michael Niedermayer [Wed, 25 Jan 2012 21:28:57 +0000 (22:28 +0100)]
smackerdec: Check that the last indexes are within the table.

Fixes CVE-2011-3944

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowma: Clip WMA1 and WMA2 frame length to 11 bits.
Alex Converse [Wed, 25 Jan 2012 02:43:43 +0000 (18:43 -0800)]
wma: Clip WMA1 and WMA2 frame length to 11 bits.

The MDCT buffers in the decoder are only sized for up to 11 bits. The
reverse engineered documentation for WMA1/2 headers say that that for
all samplerates above 32kHz 11 bits are used. 12 and 13 bit support
were added for WMAPro. I was unable to make any Microsoft tools generate
a test file at a samplerate above 48kHz.

Discovered by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

CC: libav-stable@libav.org
7 years agomovenc: Don't require frame_size to be set for modes other than mov
Martin Storsjö [Mon, 23 Jan 2012 12:56:56 +0000 (14:56 +0200)]
movenc: Don't require frame_size to be set for modes other than mov

The field frame_size isn't written to the output anywhere except
than in mov.

This facilitates stream copy from formats that don't set frame_size.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agodoc: Update APIchanges with info on muxer flushing
Martin Storsjö [Wed, 25 Jan 2012 10:43:19 +0000 (12:43 +0200)]
doc: Update APIchanges with info on muxer flushing

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomovenc: Reindent a block
Martin Storsjö [Wed, 25 Jan 2012 10:40:05 +0000 (12:40 +0200)]
movenc: Reindent a block

Also add some space around operators and wrap a comment
that extends past the 80 char "limit"/guideline.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agovp3: Copy all 3 frames for thread updates.
Michael Niedermayer [Wed, 25 Jan 2012 20:10:29 +0000 (21:10 +0100)]
vp3: Copy all 3 frames for thread updates.

This fixes a double release of the current frame on deinit.
Fixes CVE-2011-3934

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotools: Remove some unnecessary #undefs.
Diego Biurrun [Wed, 25 Jan 2012 19:11:32 +0000 (20:11 +0100)]
tools: Remove some unnecessary #undefs.

7 years agoindeo3: fix motion vector validation
Hendrik Leppkes [Wed, 25 Jan 2012 16:37:26 +0000 (17:37 +0100)]
indeo3: fix motion vector validation

The index of the motion vector has to be checked before being
multiplied by 2 for the array index.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodv: Fix null pointer dereference due to ach=0
Michael Niedermayer [Tue, 24 Jan 2012 17:51:40 +0000 (18:51 +0100)]
dv: Fix null pointer dereference due to ach=0

Fixes part2 of CVE-2011-3929

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Roman Shaposhnik <roman@shaposhnik.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodv: check stype
Michael Niedermayer [Tue, 24 Jan 2012 17:48:23 +0000 (18:48 +0100)]
dv: check stype

Fixes part1 of CVE-2011-3929
Possibly fixes part of CVE-2011-3936

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Roman Shaposhnik <roman@shaposhnik.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorv20: prevent calling ff_h263_decode_mba() with unset height/width
Janne Grunau [Tue, 24 Jan 2012 20:50:50 +0000 (21:50 +0100)]
rv20: prevent calling ff_h263_decode_mba() with unset height/width

Prevents a crash of VLC during playback of a invalid matroska file,
found by John Villamil <johnv@matasano.com>.

CC: libav-stable@libav.org
7 years agolavfi: Makefile: cosmetics: align FFLIBS.
Nicolas George [Wed, 25 Jan 2012 15:11:32 +0000 (16:11 +0100)]
lavfi: Makefile: cosmetics: align FFLIBS.

7 years agotools: K&R reformatting cosmetics
Diego Biurrun [Wed, 25 Jan 2012 14:03:18 +0000 (15:03 +0100)]
tools: K&R reformatting cosmetics

7 years agoIgnore generated aviocat and ismindex tools.
Diego Biurrun [Wed, 25 Jan 2012 13:56:24 +0000 (14:56 +0100)]
Ignore generated aviocat and ismindex tools.

7 years agobuild: Automatically include architecture-specific library Makefile snippets.
Diego Biurrun [Wed, 25 Jan 2012 12:35:19 +0000 (13:35 +0100)]
build: Automatically include architecture-specific library Makefile snippets.

7 years agoindeo5: prevent null pointer dereference on broken files
Janne Grunau [Mon, 23 Jan 2012 20:33:34 +0000 (21:33 +0100)]
indeo5: prevent null pointer dereference on broken files

Found by John Villamil <johnv@matasano.com>

7 years agopktdumper: Use usleep instead of sleep
Martin Storsjö [Wed, 25 Jan 2012 11:47:47 +0000 (13:47 +0200)]
pktdumper: Use usleep instead of sleep

MinGW doesn't have sleep, only _sleep (which is deprecated),
Sleep (which is defined in winbase.h and not in the standard
C headers) and usleep.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agocosmetics: Remove some unnecessary block braces.
Diego Biurrun [Wed, 18 Jan 2012 17:47:59 +0000 (18:47 +0100)]
cosmetics: Remove some unnecessary block braces.

7 years agoDrop unnecessary prefix from *sink* variable and struct names.
Diego Biurrun [Thu, 19 Jan 2012 15:10:13 +0000 (16:10 +0100)]
Drop unnecessary prefix from *sink* variable and struct names.

7 years agoAdd a tool for creating smooth streaming manifests
Martin Storsjö [Mon, 9 Jan 2012 16:27:33 +0000 (18:27 +0200)]
Add a tool for creating smooth streaming manifests

It can also optionally split the file into individual fragments,
which allows it to be served from any web server without any
server side support.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomovdec: Calculate an average bit rate for fragmented streams, too
Martin Storsjö [Fri, 13 Jan 2012 12:40:24 +0000 (14:40 +0200)]
movdec: Calculate an average bit rate for fragmented streams, too

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomovenc: Write the sample rate instead of time scale in the stsd atom
Martin Storsjö [Mon, 9 Jan 2012 09:05:33 +0000 (11:05 +0200)]
movenc: Write the sample rate instead of time scale in the stsd atom

For ismv/isma, the time scale might not be the same as the sample
rate.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomovenc: Add a separate ismv/isma (smooth streaming) muxer
Martin Storsjö [Mon, 9 Jan 2012 15:58:26 +0000 (17:58 +0200)]
movenc: Add a separate ismv/isma (smooth streaming) muxer

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomovenc: Allow the caller to decide on fragmentation
Martin Storsjö [Fri, 20 Jan 2012 17:29:33 +0000 (19:29 +0200)]
movenc: Allow the caller to decide on fragmentation

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolibavformat: Add a flag for muxers that support write_packet(NULL) for flushing
Martin Storsjö [Fri, 20 Jan 2012 17:27:33 +0000 (19:27 +0200)]
libavformat: Add a flag for muxers that support write_packet(NULL) for flushing

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomovenc: Add support for writing fragmented mov files
Martin Storsjö [Thu, 5 Jan 2012 11:57:05 +0000 (13:57 +0200)]
movenc: Add support for writing fragmented mov files

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomovenc: Add a separate start_pts
Martin Storsjö [Fri, 6 Jan 2012 23:32:53 +0000 (01:32 +0200)]
movenc: Add a separate start_pts

This fixes calculation of trackDuration if the MOVIentry array
is cleared. This is required by the fragmentation support in the
next patch.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agodsputil: use vertical component for drawing bottom edge.
Ronald S. Bultje [Wed, 25 Jan 2012 09:17:52 +0000 (17:17 +0800)]
dsputil: use vertical component for drawing bottom edge.

Current code only writes 8 pixels of vertical edge for YUV422, which
causes MC artifacts when subsequent frames use data from that edge.

7 years agoffmpeg: add image size check to codec_get_buffer()
Michael Niedermayer [Wed, 25 Jan 2012 05:32:05 +0000 (06:32 +0100)]
ffmpeg: add image size check to codec_get_buffer()

Fixes CVE-2011-3935

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavidec: Fix regression with chunks that are larger than the file.
Michael Niedermayer [Wed, 25 Jan 2012 04:21:23 +0000 (05:21 +0100)]
avidec: Fix regression with chunks that are larger than the file.

This commit makes the check specific to the case that needs it.

Regression was introduced by
commit 62adc60b97d854507d07a21b2f370ab5c69e6b7b
Author: Michael Niedermayer <michaelni@gmx.at>
Date:   Fri Dec 16 06:13:04 2011 +0100

    avidec: Check that the header chunks fit in the available filesize.
    Fixes Ticket771
    Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh263dec: Disallow width/height changing with frame threads.
Michael Niedermayer [Wed, 25 Jan 2012 00:30:43 +0000 (01:30 +0100)]
h263dec: Disallow width/height changing with frame threads.

Fixes CVE-2011-3937

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 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>
7 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.

7 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>
7 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>
7 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>
7 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

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

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

7 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

7 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

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

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

7 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

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

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

7 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

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

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

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

7 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

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

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

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

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

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

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

7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 years agodoc: add Timecode documentation.
Clément Bœsch [Tue, 3 Jan 2012 09:47:42 +0000 (10:47 +0100)]
doc: add Timecode documentation.

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

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

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

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

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

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

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

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

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

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

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

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

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

7 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>
7 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>
7 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

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

7 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>
7 years agoRemove ffmpeg.
Anton Khirnov [Thu, 12 Jan 2012 10:12:15 +0000 (11:12 +0100)]
Remove ffmpeg.

7 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>
7 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>
7 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>