ffmpeg.git
7 years agovsrc_buffer: Store allocated scale filter and free it later.
Michael Niedermayer [Sat, 31 Mar 2012 06:49:18 +0000 (08:49 +0200)]
vsrc_buffer: Store allocated scale filter and free it later.

Fixes a memleak.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter: allow freeing NULL.
Michael Niedermayer [Sat, 31 Mar 2012 06:48:23 +0000 (08:48 +0200)]
avfilter: allow freeing NULL.

this way avfilter_free() can be called without NULL checks.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodcttest: put ff_prores_idct_put_10_sse2_wrap under HAVE_YASM
Michael Niedermayer [Fri, 30 Mar 2012 22:03:44 +0000 (00:03 +0200)]
dcttest: put ff_prores_idct_put_10_sse2_wrap under HAVE_YASM

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 30 Mar 2012 20:10:17 +0000 (22:10 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: drop ff_h264_ prefix from static function ff_h264_decode_rbsp_trailing()
  h264: Make ff_h264_decode_end() static, it is not used externally.
  output-example: K&R formatting cosmetics, comment spelling fixes
  avf: make the example output the proper message
  avf: fix audio writing in the output-example
  mov: don't overwrite existing indexes.
  lzw: fix potential integer overflow.
  truemotion: forbid invalid VLC bitsizes and token values.
  truemotion2: handle out-of-frame motion vectors through edge extension.
  configure: Check for a different SDL function

Conflicts:
configure
doc/examples/muxing.c
libavcodec/truemotion2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosvq3: Fix pointer type mismatch warning.
Michael Niedermayer [Fri, 30 Mar 2012 19:51:46 +0000 (21:51 +0200)]
svq3: Fix pointer type mismatch warning.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocavsdec: initialize all tables to zeros.
Michael Niedermayer [Fri, 30 Mar 2012 19:47:06 +0000 (21:47 +0200)]
cavsdec: initialize all tables to zeros.

This ensures that they dont contain invalid values.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosvq1enc: fix ptr type mismatch warning
Michael Niedermayer [Fri, 30 Mar 2012 18:23:13 +0000 (20:23 +0200)]
svq1enc: fix ptr type mismatch warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeghaudiodec: Fix "set but not used" warnings
Michael Niedermayer [Fri, 30 Mar 2012 18:17:58 +0000 (20:17 +0200)]
mpeghaudiodec: Fix "set but not used" warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomjpegdec: Fix "assignment from incompatible pointer type" warnings
Michael Niedermayer [Fri, 30 Mar 2012 18:15:21 +0000 (20:15 +0200)]
mjpegdec: Fix "assignment from incompatible pointer type" warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2kenc: Fix "function declaration isn’t a prototype" warning
Michael Niedermayer [Fri, 30 Mar 2012 18:11:50 +0000 (20:11 +0200)]
j2kenc: Fix "function declaration isn’t a prototype" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2kdec: fix format strings
Michael Niedermayer [Fri, 30 Mar 2012 18:10:39 +0000 (20:10 +0200)]
j2kdec: fix format strings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agointerplayvideodec: pass correct pointer to av_dlog()
Michael Niedermayer [Fri, 30 Mar 2012 18:08:07 +0000 (20:08 +0200)]
interplayvideodec: pass correct pointer to av_dlog()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodvbsubdec: Fix "set but not used" warning
Michael Niedermayer [Fri, 30 Mar 2012 17:59:48 +0000 (19:59 +0200)]
dvbsubdec: Fix "set but not used" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavformat: Fix several "incompatible pointer type" warnings.
Michael Niedermayer [Fri, 30 Mar 2012 17:52:30 +0000 (19:52 +0200)]
libavformat: Fix several "incompatible pointer type" warnings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocavsdec: ensure the tables have been allocated before using them
Michael Niedermayer [Fri, 30 Mar 2012 17:18:42 +0000 (19:18 +0200)]
cavsdec: ensure the tables have been allocated before using them

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: drop ff_h264_ prefix from static function ff_h264_decode_rbsp_trailing()
Diego Biurrun [Thu, 29 Mar 2012 12:15:16 +0000 (14:15 +0200)]
h264: drop ff_h264_ prefix from static function ff_h264_decode_rbsp_trailing()

7 years agoh264: Make ff_h264_decode_end() static, it is not used externally.
Diego Biurrun [Thu, 29 Mar 2012 11:52:21 +0000 (13:52 +0200)]
h264: Make ff_h264_decode_end() static, it is not used externally.

Also drop the now unnecessary ff_ prefix from its name.

7 years agooutput-example: K&R formatting cosmetics, comment spelling fixes
Diego Biurrun [Fri, 30 Mar 2012 00:27:05 +0000 (02:27 +0200)]
output-example: K&R formatting cosmetics, comment spelling fixes

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 30 Mar 2012 04:03:30 +0000 (06:03 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mp3dec: perform I/S and M/S only when frame mode is joint stereo.
  id3v2: add another mimetype for JPEG image
  lzw: prevent buffer overreads.
  WMAL: Remove inaccurate and unnecessary doxy
  h264: fix cabac-on-stack after safe cabac reader.
  truemotion2: convert packet header reading to bytestream2.

Conflicts:
libavcodec/lzw.c
libavcodec/truemotion2.c
libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoimg2dec: remove GLOB_TILDE support.
Michael Niedermayer [Thu, 29 Mar 2012 22:35:01 +0000 (00:35 +0200)]
img2dec: remove GLOB_TILDE support.

tilde expansion should/can be done by the shell

Reviewed-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavf: make the example output the proper message
Luca Barbato [Thu, 29 Mar 2012 22:28:00 +0000 (15:28 -0700)]
avf: make the example output the proper message

av_dump_format needs the codecs opened in order to print
them.

7 years agoavf: fix audio writing in the output-example
Luca Barbato [Thu, 29 Mar 2012 19:00:37 +0000 (12:00 -0700)]
avf: fix audio writing in the output-example

av_init_packet does not reset data and size fields in AVPacket,
avcodec_encode_audio2 can use preallocated AVPacket.

7 years agoimg2dec: Recognize glob meta chars only if prefixed by %
Alexander Strasser [Sun, 11 Mar 2012 14:24:51 +0000 (15:24 +0100)]
img2dec: Recognize glob meta chars only if prefixed by %

  This changes globbing support to only be used if the character
contains at least one glob meta character that is preceded by
an unescaped %. To escape a literal % one would use %% which is
identical to the way to match a % with image2 sequence generation
feature.

* Makes it possible to have patterns like %04d-[720p].jpg work
  again with sequence number generation. Previously this would
  always be detected as a glob pattern and was interpreted by
  the image2 glob code instead.

* Makes it possible to use %*-[720p].jpg to match above pattern
  without having to double escape it to be not interpreted by most
  shells and not by the image2 glob code (previously one would
  need to use \*-\\\[720p\\\].jpg to achieve the same)

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoimg2: glob matching for image series
Brian Olson [Mon, 27 Feb 2012 09:27:17 +0000 (10:27 +0100)]
img2: glob matching for image series

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: check pts like dts for being in the past.
Michael Niedermayer [Thu, 29 Mar 2012 20:32:53 +0000 (22:32 +0200)]
ffmpeg: check pts like dts for being in the past.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomov: don't overwrite existing indexes.
Ronald S. Bultje [Wed, 28 Mar 2012 19:56:07 +0000 (12:56 -0700)]
mov: don't overwrite existing indexes.

Prevents all kind of badness if files contain multiple
indexes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agolzw: fix potential integer overflow.
Ronald S. Bultje [Thu, 29 Mar 2012 03:00:38 +0000 (20:00 -0700)]
lzw: fix potential integer overflow.

7 years agotruemotion: forbid invalid VLC bitsizes and token values.
Ronald S. Bultje [Thu, 29 Mar 2012 17:25:04 +0000 (10:25 -0700)]
truemotion: forbid invalid VLC bitsizes and token values.

SHOW_UBITS() is only defined up to n_bits is 25, therefore forbid
values larger than this in get_vlc2() (max_bits). tokens[][] can be
used as an index in deltas[], which has a size of 64, so ensure the
values are smaller than that.

This prevents crashes on corrupt bitstreams.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agotruemotion2: handle out-of-frame motion vectors through edge extension.
Ronald S. Bultje [Thu, 29 Mar 2012 16:29:03 +0000 (09:29 -0700)]
truemotion2: handle out-of-frame motion vectors through edge extension.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agolavf: print ts values in pts < dts error message
Michael Niedermayer [Thu, 29 Mar 2012 18:31:14 +0000 (20:31 +0200)]
lavf: print ts values in pts < dts error message

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: Check for a different SDL function
Martin Storsjö [Wed, 28 Mar 2012 17:37:13 +0000 (20:37 +0300)]
configure: Check for a different SDL function

This one is available both in SDL 1.2 and in 1.3 (which is the current
version available e.g. in macports), while 1.3 doesn't contain
SDL_Linked_Version().

The current check for SDL_Linked_Version() (available since SDL 1.2.13)
was added in 8f1b06c8, because including the headers for SDL_Init()
redirects the main() function, requiring the main function signature
to match the one of SDL_main (including argc/argv).

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoffmpeg: switch duration calculation code from avg to r frame_rate.
Michael Niedermayer [Thu, 29 Mar 2012 17:08:17 +0000 (19:08 +0200)]
ffmpeg: switch duration calculation code from avg to r frame_rate.

This heuristic is less likely to overshoot and cause encoder failure.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomp3dec: perform I/S and M/S only when frame mode is joint stereo.
Kostya Shishkov [Thu, 29 Mar 2012 10:08:07 +0000 (12:08 +0200)]
mp3dec: perform I/S and M/S only when frame mode is joint stereo.

Looks like some LAME versions produce dual stereo mode MP3s with
flags for intensity and middle stereo set. In this mode those flags
should be ignored like the reference decoder and derived ones do.

7 years agoid3v2: add another mimetype for JPEG image
Kostya Shishkov [Thu, 29 Mar 2012 10:07:35 +0000 (12:07 +0200)]
id3v2: add another mimetype for JPEG image

7 years agoDo not try to use lowres for unusual jpg subsampling.
Carl Eugen Hoyos [Thu, 29 Mar 2012 11:09:37 +0000 (13:09 +0200)]
Do not try to use lowres for unusual jpg subsampling.

Fixes ticket #1144.

7 years agoRevert "Fix compilation with hardcoded tables."
Carl Eugen Hoyos [Thu, 29 Mar 2012 06:02:10 +0000 (08:02 +0200)]
Revert "Fix compilation with hardcoded tables."

This reverts commit b17b2963692f5f7c19a2188e61922e00680c5fb4.

7 years agofate/vp8-size-change: set bitexact flag
Michael Niedermayer [Thu, 29 Mar 2012 04:03:55 +0000 (06:03 +0200)]
fate/vp8-size-change: set bitexact flag

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: pass bitexact flag to vsrc_buffer
Michael Niedermayer [Thu, 29 Mar 2012 03:56:47 +0000 (05:56 +0200)]
ffmpeg: pass bitexact flag to vsrc_buffer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoiff: prevent a possible crash with broken/prepared IFF PBM
Piotr Bandurski [Thu, 29 Mar 2012 02:59:58 +0000 (04:59 +0200)]
iff: prevent a possible crash with broken/prepared IFF PBM

Based on fix by Peter Ross for ticket #1054.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge git://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder
Michael Niedermayer [Thu, 29 Mar 2012 02:54:57 +0000 (04:54 +0200)]
Merge git://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder

* git://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder:
  Fixes ticket 1127. I'm still looking into why bpp is getting set to 0.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: dont disable dr1 when changing dimensions are encountered in codec_get_buffer().
Michael Niedermayer [Thu, 29 Mar 2012 02:37:14 +0000 (04:37 +0200)]
ffmpeg: dont disable dr1 when changing dimensions are encountered in codec_get_buffer().

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: disable dr1 when frame sizes change.
Michael Niedermayer [Thu, 29 Mar 2012 02:13:27 +0000 (04:13 +0200)]
ffmpeg: disable dr1 when frame sizes change.

dr1 seems to work fine with frame size changes but many filters
cant handle it yet. Simply disabling it forces the alternative
non dr1 code path which has been tested more completely and
is known to handle frame size changes in a wider varity of
cases.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter: set w/h in avfilter_fill_frame_from_video_buffer_ref().
Michael Niedermayer [Thu, 29 Mar 2012 02:11:55 +0000 (04:11 +0200)]
avfilter: set w/h in avfilter_fill_frame_from_video_buffer_ref().

This fixes issues with AVFrame w/h being wrong in some cases

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

* qatar/master:
  asf: only set index_read if the index contained entries.
  cabac: add overread protection to BRANCHLESS_GET_CABAC().
  cabac: increment jump locations by one in callers of BRANCHLESS_GET_CABAC().
  cabac: remove unused argument from BRANCHLESS_GET_CABAC_UPDATE().
  cabac: use struct+offset instead of memory operand in BRANCHLESS_GET_CABAC().
  h264: add overread protection to get_cabac_bypass_sign_x86().
  h264: reindent get_cabac_bypass_sign_x86().
  h264: use struct offsets in get_cabac_bypass_sign_x86().
  h264: fix overreads in cabac reader.
  wmall: fix seeking.
  lagarith: fix buffer overreads.
  dvdec: drop unnecessary dv_tablegen.h #include
  build: fix doc generation errors in parallel builds
  Replace memset(0) by zero initializations.
  faandct: Remove FAAN_POSTSCALE define and related code.
  dvenc: print allowed profiles if the video doesn't conform to any of them.
  avcodec_encode_{audio,video}: only reallocate output packet when it has non-zero size.
  FATE: add a test for vp8 with changing frame size.
  fate: add kgv1 fate test.
  oggdec: calculate correct timestamps in Ogg/FLAC

Conflicts:
libavcodec/4xm.c
libavcodec/cook.c
libavcodec/dvdata.c
libavcodec/dvdsubdec.c
libavcodec/lagarith.c
libavcodec/lagarithrac.c
libavcodec/utils.c
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolzw: prevent buffer overreads.
Ronald S. Bultje [Thu, 29 Mar 2012 00:06:00 +0000 (17:06 -0700)]
lzw: prevent buffer overreads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoWMAL: Remove inaccurate and unnecessary doxy
Mashiat Sarker Shakkhar [Wed, 28 Mar 2012 18:12:13 +0000 (11:12 -0700)]
WMAL: Remove inaccurate and unnecessary doxy

A call to decode_packet() does not always decode a complete WMA packet.
Moreover, this is not the correct place to document calls that are part
of the public API.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoh264: fix cabac-on-stack after safe cabac reader.
Ronald S. Bultje [Wed, 28 Mar 2012 23:32:27 +0000 (16:32 -0700)]
h264: fix cabac-on-stack after safe cabac reader.

7 years agoFixes ticket 1127.
Michael Bradshaw [Wed, 28 Mar 2012 16:22:49 +0000 (10:22 -0600)]
Fixes ticket 1127.
I'm still looking into why bpp is getting set to 0.

7 years agodoc/ffmpeg: update and extend documentation for -copytb
Stefano Sabatini [Sat, 24 Mar 2012 15:11:46 +0000 (16:11 +0100)]
doc/ffmpeg: update and extend documentation for -copytb

Address trac ticket #1120.

7 years agotruemotion2: convert packet header reading to bytestream2.
Ronald S. Bultje [Wed, 28 Mar 2012 18:53:13 +0000 (11:53 -0700)]
truemotion2: convert packet header reading to bytestream2.

Also use correct buffer sizes in calls to tm2_read_stream(). Together,
this prevents overreads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoasf: only set index_read if the index contained entries.
Ronald S. Bultje [Wed, 28 Mar 2012 17:22:25 +0000 (10:22 -0700)]
asf: only set index_read if the index contained entries.

This allows falling back to a binary search if the file contains no
index, thus fixing seeking in such files (e.g. luckynight.wma).

7 years agocabac: add overread protection to BRANCHLESS_GET_CABAC().
Ronald S. Bultje [Sat, 17 Mar 2012 16:09:41 +0000 (09:09 -0700)]
cabac: add overread protection to BRANCHLESS_GET_CABAC().

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
7 years agocabac: increment jump locations by one in callers of BRANCHLESS_GET_CABAC().
Ronald S. Bultje [Sat, 17 Mar 2012 16:04:32 +0000 (09:04 -0700)]
cabac: increment jump locations by one in callers of BRANCHLESS_GET_CABAC().

7 years agocabac: remove unused argument from BRANCHLESS_GET_CABAC_UPDATE().
Ronald S. Bultje [Sat, 17 Mar 2012 16:03:22 +0000 (09:03 -0700)]
cabac: remove unused argument from BRANCHLESS_GET_CABAC_UPDATE().

7 years agocabac: use struct+offset instead of memory operand in BRANCHLESS_GET_CABAC().
Ronald S. Bultje [Sat, 17 Mar 2012 16:02:44 +0000 (09:02 -0700)]
cabac: use struct+offset instead of memory operand in BRANCHLESS_GET_CABAC().

7 years agoh264: add overread protection to get_cabac_bypass_sign_x86().
Ronald S. Bultje [Sat, 17 Mar 2012 15:58:48 +0000 (08:58 -0700)]
h264: add overread protection to get_cabac_bypass_sign_x86().

7 years agoh264: reindent get_cabac_bypass_sign_x86().
Ronald S. Bultje [Sat, 17 Mar 2012 16:32:03 +0000 (09:32 -0700)]
h264: reindent get_cabac_bypass_sign_x86().

7 years agoh264: use struct offsets in get_cabac_bypass_sign_x86().
Ronald S. Bultje [Sat, 17 Mar 2012 05:41:17 +0000 (22:41 -0700)]
h264: use struct offsets in get_cabac_bypass_sign_x86().

7 years agoh264: fix overreads in cabac reader.
Ronald S. Bultje [Sat, 17 Mar 2012 04:56:40 +0000 (21:56 -0700)]
h264: fix overreads in cabac reader.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoass: fix aspect ratio computation.
Nicolas George [Thu, 22 Mar 2012 19:59:36 +0000 (20:59 +0100)]
ass: fix aspect ratio computation.

7 years agowmall: fix seeking.
Ronald S. Bultje [Wed, 28 Mar 2012 14:14:21 +0000 (07:14 -0700)]
wmall: fix seeking.

7 years agolagarith: fix buffer overreads.
Ronald S. Bultje [Tue, 27 Mar 2012 19:26:46 +0000 (12:26 -0700)]
lagarith: fix buffer overreads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agodvdec: drop unnecessary dv_tablegen.h #include
Diego Biurrun [Wed, 28 Mar 2012 13:44:18 +0000 (15:44 +0200)]
dvdec: drop unnecessary dv_tablegen.h #include

dvdec.c uses nothing from dv_tablegen.h.  As a welcome side-effect, this
fixes compilation of that file with hardcoded tables enabled.

7 years agoindeo4: Dont leave tables in random state on errors.
Michael Niedermayer [Wed, 28 Mar 2012 12:53:17 +0000 (14:53 +0200)]
indeo4: Dont leave tables in random state on errors.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoindeo4: apply correction to eob/esc indexes too
Michael Niedermayer [Wed, 28 Mar 2012 12:52:27 +0000 (14:52 +0200)]
indeo4: apply correction to eob/esc indexes too

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoindeo4: Check for mismatching scan tables
Michael Niedermayer [Wed, 28 Mar 2012 12:51:21 +0000 (14:51 +0200)]
indeo4: Check for mismatching scan tables

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: fix doc generation errors in parallel builds
Mans Rullgard [Tue, 27 Mar 2012 21:42:41 +0000 (22:42 +0100)]
build: fix doc generation errors in parallel builds

The $(dir) function used to construct OBJDIRS includes a trailing slash
in the names returned, which GNU make 3.82 does not match to the
slash-less 'doc' in the documentation dependencies, causing parallel
build to fail.  Adding a slash fixes this and still works with make
3.81.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agovc1dec: Fix global array overread.
Michael Niedermayer [Wed, 28 Mar 2012 08:44:43 +0000 (10:44 +0200)]
vc1dec: Fix global array overread.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoapedec: fix global array overread
Michael Niedermayer [Wed, 28 Mar 2012 08:30:44 +0000 (10:30 +0200)]
apedec: fix global array overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoReplace memset(0) by zero initializations.
Diego Biurrun [Mon, 6 Jun 2011 12:13:02 +0000 (14:13 +0200)]
Replace memset(0) by zero initializations.

Also remove one pointless zero initialization in rangecoder.c.

7 years agofaandct: Remove FAAN_POSTSCALE define and related code.
Diego Biurrun [Tue, 27 Mar 2012 14:42:23 +0000 (16:42 +0200)]
faandct: Remove FAAN_POSTSCALE define and related code.

It is not a user-accessible option and unlikely to ever be changed.

7 years agodvenc: print allowed profiles if the video doesn't conform to any of them.
Anton Khirnov [Mon, 26 Mar 2012 11:02:54 +0000 (13:02 +0200)]
dvenc: print allowed profiles if the video doesn't conform to any of them.

7 years agoavcodec_encode_{audio,video}: only reallocate output packet when it has non-zero...
Anton Khirnov [Tue, 27 Mar 2012 06:21:02 +0000 (08:21 +0200)]
avcodec_encode_{audio,video}: only reallocate output packet when it has non-zero size.

Otherwise realloc would free it, which would result in double free
later.

7 years agoFATE: add a test for vp8 with changing frame size.
Anton Khirnov [Mon, 26 Mar 2012 18:53:10 +0000 (20:53 +0200)]
FATE: add a test for vp8 with changing frame size.

7 years agoapedec: check bits <= 32
Michael Niedermayer [Wed, 28 Mar 2012 06:22:39 +0000 (08:22 +0200)]
apedec: check bits <= 32

Fixes FPE

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotm2dec: check total_frames and extradata_size.
Michael Niedermayer [Wed, 28 Mar 2012 06:05:11 +0000 (08:05 +0200)]
tm2dec: check total_frames and extradata_size.

Fixes overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix compilation with hardcoded tables.
Carl Eugen Hoyos [Wed, 28 Mar 2012 06:06:38 +0000 (08:06 +0200)]
Fix compilation with hardcoded tables.

7 years agotm2: Fix overread of token array.
Michael Niedermayer [Wed, 28 Mar 2012 05:37:12 +0000 (07:37 +0200)]
tm2: Fix overread of token array.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolzw(gif): Fix overread
Michael Niedermayer [Wed, 28 Mar 2012 05:25:06 +0000 (07:25 +0200)]
lzw(gif): Fix overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolagarith: Fix various issues that lead to out of array reads.
Michael Niedermayer [Wed, 28 Mar 2012 04:41:13 +0000 (06:41 +0200)]
lagarith: Fix various issues that lead to out of array reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolagarith: fix flipped return value
Michael Niedermayer [Wed, 28 Mar 2012 04:40:14 +0000 (06:40 +0200)]
lagarith: fix flipped return value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolagarithrac: fix length used in ff_lag_rac_init()
Michael Niedermayer [Wed, 28 Mar 2012 04:26:54 +0000 (06:26 +0200)]
lagarithrac: fix length used in ff_lag_rac_init()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 28 Mar 2012 02:12:24 +0000 (04:12 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  westwood_vqa: fix SND0 chunk handling
  westwood_vqa: set video stream duration
  raw: forward avpicture_fill() error code in raw_decode().
  build: Do not explicitly add the doc directory to the OBJDIRS list.
  dv: Split off DV video decoder into its own file.
  build: fix RALF decoder standalone compilation, which depends on Golomb code
  configure: Drop stray duplicate entry for --disable-fft from help output.

Conflicts:
libavcodec/dv.c
libavcodec/rawdec.c
libavformat/westwood_vqa.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh263dec: Restore w/h values to a consistent state if a change is rejected.
Michael Niedermayer [Wed, 28 Mar 2012 01:17:48 +0000 (03:17 +0200)]
h263dec: Restore w/h values to a consistent state if a change is rejected.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: add kgv1 fate test.
Ronald S. Bultje [Tue, 27 Mar 2012 19:56:51 +0000 (12:56 -0700)]
fate: add kgv1 fate test.

Tested to be bit-exact across x86-64, x86-32 and ppc.

7 years agoid3v2: support JPEG APIC with incorrect (image/jpg) MIME type
Piotr Bandurski [Tue, 27 Mar 2012 22:13:32 +0000 (00:13 +0200)]
id3v2: support JPEG APIC with incorrect (image/jpg) MIME type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoSupport FLIC in AVI.
Paul B Mahol [Tue, 27 Mar 2012 18:53:05 +0000 (18:53 +0000)]
Support FLIC in AVI.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Wed, 28 Mar 2012 00:16:48 +0000 (02:16 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: pause rdft column when ffplay is paused

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggdec: calculate correct timestamps in Ogg/FLAC
Justin Ruggles [Tue, 27 Mar 2012 18:08:27 +0000 (14:08 -0400)]
oggdec: calculate correct timestamps in Ogg/FLAC

We need to parse the individual packet durations when there is more than one
packet in a page.

7 years agoffplay: pause rdft column when ffplay is paused
Michael Niedermayer [Tue, 27 Mar 2012 02:11:14 +0000 (04:11 +0200)]
ffplay: pause rdft column when ffplay is paused

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoXBM decoder
Paul B Mahol [Fri, 23 Mar 2012 22:54:09 +0000 (22:54 +0000)]
XBM decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2kdec: move ff_j2k_init_tier1_luts() to j2kdec_init()
Paul B Mahol [Tue, 27 Mar 2012 14:06:53 +0000 (14:06 +0000)]
j2kdec: move ff_j2k_init_tier1_luts() to j2kdec_init()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoClarify the use of the interl=1|-1 option of the scale filter.
Tim Nicholson [Mon, 26 Mar 2012 16:39:05 +0000 (17:39 +0100)]
Clarify the use of the interl=1|-1 option of the scale filter.

It is not entirely clear that whilst for width and height only an
expression needs to be provided, for interlace the option must
also be given.

It is also unclear that the default is non interlaced aware scaling.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoalsdec: check return values.
Thilo Borgmann [Tue, 27 Mar 2012 16:06:54 +0000 (18:06 +0200)]
alsdec: check return values.

7 years agowestwood_vqa: fix SND0 chunk handling
Paul B Mahol [Tue, 20 Mar 2012 22:27:09 +0000 (22:27 +0000)]
westwood_vqa: fix SND0 chunk handling

Version from vqa header does not dictate which sound chunks may
appear in file.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agowestwood_vqa: set video stream duration
Paul B Mahol [Tue, 20 Mar 2012 22:26:41 +0000 (22:26 +0000)]
westwood_vqa: set video stream duration

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoraw: forward avpicture_fill() error code in raw_decode().
Ronald S. Bultje [Tue, 27 Mar 2012 01:02:08 +0000 (18:02 -0700)]
raw: forward avpicture_fill() error code in raw_decode().

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoh264: dont mess with chroma planes for grayscale h264.
Michael Niedermayer [Tue, 27 Mar 2012 13:16:37 +0000 (15:16 +0200)]
h264: dont mess with chroma planes for grayscale h264.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoalsdec: make sure no invalid opt_order stays in the context.
Michael Niedermayer [Tue, 27 Mar 2012 11:49:58 +0000 (13:49 +0200)]
alsdec: make sure no invalid opt_order stays in the context.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovc1dec: dont ignore ff_vc1_parse_frame_header_advs return value
Michael Niedermayer [Tue, 27 Mar 2012 11:21:56 +0000 (13:21 +0200)]
vc1dec: dont ignore ff_vc1_parse_frame_header_advs return value

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