ffmpeg.git
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 3 Dec 2012 01:59:19 +0000 (02:59 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: fft: Fix libavcodec dependency
  build: Make the ISMV muxer select the MOV muxer
  configure: move arm arch extensions to a separate variable

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'
Michael Niedermayer [Mon, 3 Dec 2012 01:21:08 +0000 (02:21 +0100)]
Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

* commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6':
  fate-seek: remove use of gnu make 3.82 only private modifier
  fate: move vsynth reference files to their own directory
  fate: move fate-acodec reference files to their own dir
  configure: avplay now depends on avresample
  fate: split dependencies for fate-seek tests

Conflicts:
configure
tests/fate/seek.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '0b300daad2f5cb59a7c06dde5ac701685e6edf16'
Michael Niedermayer [Mon, 3 Dec 2012 00:56:47 +0000 (01:56 +0100)]
Merge commit '0b300daad2f5cb59a7c06dde5ac701685e6edf16'

* commit '0b300daad2f5cb59a7c06dde5ac701685e6edf16':
  h264: error out on unset current_picture_ptr for h->current_slice > 0
  avprobe: report per stream bit rate if set by the decoder
  aac: avoid a memcpy in sbr_qmf_analysis

Conflicts:
avprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovp56: Ignore reconfiguration from the alpha plane.
Michael Niedermayer [Mon, 3 Dec 2012 00:26:23 +0000 (01:26 +0100)]
vp56: Ignore reconfiguration from the alpha plane.

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: fft: Fix libavcodec dependency
Diego Biurrun [Wed, 28 Nov 2012 23:22:25 +0000 (00:22 +0100)]
fate: fft: Fix libavcodec dependency

7 years agobuild: Make the ISMV muxer select the MOV muxer
Diego Biurrun [Sat, 1 Dec 2012 16:56:00 +0000 (17:56 +0100)]
build: Make the ISMV muxer select the MOV muxer

They share the same code, so building one w/o the other makes no sense.

7 years agoconfigure: move arm arch extensions to a separate variable
Mans Rullgard [Sat, 1 Dec 2012 12:26:12 +0000 (12:26 +0000)]
configure: move arm arch extensions to a separate variable

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agofate-seek: remove use of gnu make 3.82 only private modifier
Janne Grunau [Sun, 2 Dec 2012 23:37:07 +0000 (00:37 +0100)]
fate-seek: remove use of gnu make 3.82 only private modifier

7 years agofate: move vsynth reference files to their own directory
Janne Grunau [Sun, 2 Dec 2012 23:36:10 +0000 (00:36 +0100)]
fate: move vsynth reference files to their own directory

7 years agofate: move fate-acodec reference files to their own dir
Janne Grunau [Sun, 2 Dec 2012 23:29:35 +0000 (00:29 +0100)]
fate: move fate-acodec reference files to their own dir

7 years agoconfigure: avplay now depends on avresample
Diego Biurrun [Wed, 28 Nov 2012 23:14:23 +0000 (00:14 +0100)]
configure: avplay now depends on avresample

7 years agofate: split dependencies for fate-seek tests
Janne Grunau [Sun, 2 Dec 2012 19:31:20 +0000 (20:31 +0100)]
fate: split dependencies for fate-seek tests

Each fate-seek test depends now only on the corresponding fate-acodec,
fate-vsynth2 or fate-lavf test which creates the file seek-tests
operates on. The tests and references are renamed to match the test they
depend on.

7 years agoh264: error out on unset current_picture_ptr for h->current_slice > 0
Janne Grunau [Wed, 21 Nov 2012 18:41:59 +0000 (19:41 +0100)]
h264: error out on unset current_picture_ptr for h->current_slice > 0

Fixes a segfault with fuzzed sample sample_varPAR_s11622_r001-02.avi.

CC: libav-stable@libav.org
7 years agoavprobe: report per stream bit rate if set by the decoder
Janne Grunau [Fri, 30 Nov 2012 14:44:19 +0000 (15:44 +0100)]
avprobe: report per stream bit rate if set by the decoder

7 years agowtvdec: fix null pointer dereference
Michael Niedermayer [Sun, 2 Dec 2012 21:36:15 +0000 (22:36 +0100)]
wtvdec: fix null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaac: avoid a memcpy in sbr_qmf_analysis
Christophe Gisquet [Wed, 28 Nov 2012 21:47:25 +0000 (22:47 +0100)]
aac: avoid a memcpy in sbr_qmf_analysis

Swapping buffer indices allows saving one memcpy that accounts for 1% of the
runtime, according to oprofile.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoasfdec: check extradata size before alloc and read
Michael Niedermayer [Sun, 2 Dec 2012 19:37:09 +0000 (20:37 +0100)]
asfdec: check extradata size before alloc and read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: check for integer overflow, fix null pointer dereference
Michael Niedermayer [Sun, 2 Dec 2012 19:36:32 +0000 (20:36 +0100)]
h264: check for integer overflow, fix null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/channel_layout: document the semantic of layouts.
Nicolas George [Wed, 28 Nov 2012 11:05:24 +0000 (12:05 +0100)]
lavu/channel_layout: document the semantic of layouts.

7 years agolavfi/bbox: switch to ff_filter_frame() API
Stefano Sabatini [Sun, 2 Dec 2012 17:13:49 +0000 (18:13 +0100)]
lavfi/bbox: switch to ff_filter_frame() API

7 years agolavfi/alphamerge: fix leak introduced in 217163eb
Stefano Sabatini [Sun, 2 Dec 2012 17:03:04 +0000 (18:03 +0100)]
lavfi/alphamerge: fix leak introduced in 217163eb

7 years agogifdec: read pixel aspect ratio
Paul B Mahol [Sat, 1 Dec 2012 12:36:16 +0000 (12:36 +0000)]
gifdec: read pixel aspect ratio

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/vf_super2xsai: fix output ref size.
Nicolas George [Sun, 2 Dec 2012 16:08:17 +0000 (17:08 +0100)]
lavfi/vf_super2xsai: fix output ref size.

7 years agolavfi/framestep: switch to ff_filter_frame API
Stefano Sabatini [Sun, 2 Dec 2012 01:02:47 +0000 (02:02 +0100)]
lavfi/framestep: switch to ff_filter_frame API

7 years agolavfi/super2xsai: switch to ff_filter_frame() API
Stefano Sabatini [Sun, 2 Dec 2012 00:53:02 +0000 (01:53 +0100)]
lavfi/super2xsai: switch to ff_filter_frame() API

7 years agolavfi/hue: move to ff_filter_frame.
Clément Bœsch [Sun, 2 Dec 2012 00:11:48 +0000 (01:11 +0100)]
lavfi/hue: move to ff_filter_frame.

7 years agofate: add hue filter test.
Clément Bœsch [Sun, 2 Dec 2012 00:49:59 +0000 (01:49 +0100)]
fate: add hue filter test.

7 years agolavfi/vf_tile: forward errors.
Nicolas George [Thu, 29 Nov 2012 16:13:06 +0000 (17:13 +0100)]
lavfi/vf_tile: forward errors.

7 years agolavfi/vf_tile: cosmetic after last commit.
Nicolas George [Thu, 29 Nov 2012 16:10:05 +0000 (17:10 +0100)]
lavfi/vf_tile: cosmetic after last commit.

7 years agolavfi/vf_tile: switch to filter_frame.
Nicolas George [Thu, 29 Nov 2012 16:08:30 +0000 (17:08 +0100)]
lavfi/vf_tile: switch to filter_frame.

Also add error check on buffer allocation.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 2 Dec 2012 12:47:07 +0000 (13:47 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: fix indentation in option parsing loop

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/decimate: switch to ff_filter_frame() API
Stefano Sabatini [Sun, 2 Dec 2012 00:20:31 +0000 (01:20 +0100)]
lavfi/decimate: switch to ff_filter_frame() API

7 years agolavfi/alphamerge: switch to ff_filter_frame() API
Stefano Sabatini [Sun, 2 Dec 2012 00:11:52 +0000 (01:11 +0100)]
lavfi/alphamerge: switch to ff_filter_frame() API

7 years agolavfi/blackdetect: switch to new ff_filter_frame() API
Stefano Sabatini [Sat, 1 Dec 2012 23:58:59 +0000 (00:58 +0100)]
lavfi/blackdetect: switch to new ff_filter_frame() API

7 years agolavu/parseutils: accept %J for hours >= 24.
Nicolas George [Sat, 1 Dec 2012 15:58:51 +0000 (16:58 +0100)]
lavu/parseutils: accept %J for hours >= 24.

Allow to parse durations >= 24:00:00.

7 years agompc8: check seektable size before attempting to use it.
Michael Niedermayer [Sun, 2 Dec 2012 03:21:42 +0000 (04:21 +0100)]
mpc8: check seektable size before attempting to use it.

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodcadec: fix reading from prior to an array
Michael Niedermayer [Sun, 2 Dec 2012 03:00:50 +0000 (04:00 +0100)]
dcadec: fix reading from prior to an array

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/hqdn3d: avoid use of uninitialized variable.
Clément Bœsch [Sun, 2 Dec 2012 01:53:22 +0000 (02:53 +0100)]
lavfi/hqdn3d: avoid use of uninitialized variable.

7 years agolavfi/gradfun: avoid use of uninitialized variable.
Clément Bœsch [Sun, 2 Dec 2012 01:25:09 +0000 (02:25 +0100)]
lavfi/gradfun: avoid use of uninitialized variable.

7 years agoxxan: more complete ybuf checks, fix out of array accesses.
Michael Niedermayer [Sat, 1 Dec 2012 22:20:48 +0000 (23:20 +0100)]
xxan: more complete ybuf checks, fix out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAdd FourCC V264 for H264 in CCTV recordings.
Carl Eugen Hoyos [Sat, 1 Dec 2012 23:43:39 +0000 (00:43 +0100)]
Add FourCC V264 for H264 in CCTV recordings.

7 years agolavfi/vsrc: switch to ff_filter_frame.
Clément Bœsch [Sat, 1 Dec 2012 00:24:21 +0000 (01:24 +0100)]
lavfi/vsrc: switch to ff_filter_frame.

7 years agoconfigure: fix indentation in option parsing loop
Mans Rullgard [Thu, 29 Nov 2012 18:03:50 +0000 (18:03 +0000)]
configure: fix indentation in option parsing loop

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agolavf/assdec: return appropriate error code instead of -1.
Clément Bœsch [Fri, 23 Nov 2012 21:47:51 +0000 (22:47 +0100)]
lavf/assdec: return appropriate error code instead of -1.

7 years agolavf/assdec: add ass_ prefix to callbacks.
Clément Bœsch [Fri, 23 Nov 2012 21:47:09 +0000 (22:47 +0100)]
lavf/assdec: add ass_ prefix to callbacks.

7 years agolavf/assdec: rewrite using the demux subtitles API.
Clément Bœsch [Fri, 23 Nov 2012 21:45:05 +0000 (22:45 +0100)]
lavf/assdec: rewrite using the demux subtitles API.

7 years agolavf: use ff_subtitles_queue_seek() for text subtitles demuxers.
Clément Bœsch [Fri, 23 Nov 2012 20:43:54 +0000 (21:43 +0100)]
lavf: use ff_subtitles_queue_seek() for text subtitles demuxers.

7 years agolavf/subtitles: seek a little more backward when necessary.
Clément Bœsch [Fri, 30 Nov 2012 06:00:59 +0000 (07:00 +0100)]
lavf/subtitles: seek a little more backward when necessary.

If some previous subtitles are overlapping with the current time
we make sure they are raised so the renderer can display them too.

7 years agolavf/subtitles: add ff_subtitles_queue_seek().
Clément Bœsch [Fri, 23 Nov 2012 20:40:46 +0000 (21:40 +0100)]
lavf/subtitles: add ff_subtitles_queue_seek().

This function is almost identical to lavf/assdec:read_seek2(). It
performs a generic seek for text subtitles demuxers for the new seeking
API.

The only difference with assdec:read_seek2 is the ts_diff being
unsigned to avoid overflows.

The seek callback in the ASS demuxer will be removed when it is
redesigned to use FFDemuxSubtitlesQueue.

7 years agoffmpeg: use avformat_seek_file() instead of av_seek_frame().
Clément Bœsch [Fri, 23 Nov 2012 20:11:49 +0000 (21:11 +0100)]
ffmpeg: use avformat_seek_file() instead of av_seek_frame().

avformat_seek_file() is the new API. It will make sure the read_seek2()
callback is called when the demuxer has it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
7 years agovmnc: Check for integer overflow
Michael Niedermayer [Sat, 1 Dec 2012 21:09:14 +0000 (22:09 +0100)]
vmnc: Check for integer overflow

Fixes null pointer dereference and potential out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodcadec: check lfe field
Michael Niedermayer [Sat, 1 Dec 2012 20:42:02 +0000 (21:42 +0100)]
dcadec: check lfe field

Fix out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoPVF demuxer
Paul B Mahol [Fri, 30 Nov 2012 16:49:24 +0000 (16:49 +0000)]
PVF demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoSupport Sorenson Spark in f4v files streamed by Flash Media Server.
Carl Eugen Hoyos [Sat, 1 Dec 2012 20:16:11 +0000 (21:16 +0100)]
Support Sorenson Spark in f4v files streamed by Flash Media Server.

7 years agomxfdec: check index_tables before dereferencing in close.
Michael Niedermayer [Sat, 1 Dec 2012 19:15:02 +0000 (20:15 +0100)]
mxfdec: check index_tables before dereferencing in close.

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosvq1dec: update w/h only if the header is successfully parsed.
Michael Niedermayer [Sat, 1 Dec 2012 18:16:19 +0000 (19:16 +0100)]
svq1dec: update w/h only if the header is successfully parsed.

Prevents inconsistency and out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/opt: allow to set sample and pixel format with av_opt_set_int()
Stefano Sabatini [Sat, 1 Dec 2012 00:07:24 +0000 (01:07 +0100)]
lavu/opt: allow to set sample and pixel format with av_opt_set_int()

This change requires the user to specify min and max value, and makes
possible to prevent the user to set AV_{SAMPLE,PIX}_FMT_NONE if
forbidden.

Add required ifdeffery in case of mixed libraries, when libavutil is
updated but not the other libraries.

This is a followup of 08d0969c1402ccec4dce44bd430128fb59d7b790.

7 years agofate/mp3: increase fuzz for NEON, due to different rounding from lrintf()
Michael Niedermayer [Sat, 1 Dec 2012 16:02:04 +0000 (17:02 +0100)]
fate/mp3: increase fuzz for NEON, due to different rounding from lrintf()

This should fix fate failures of the hecommon test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/geq: add T variable and example
Stefano Sabatini [Sat, 1 Dec 2012 11:47:51 +0000 (12:47 +0100)]
lavfi/geq: add T variable and example

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 1 Dec 2012 12:10:48 +0000 (13:10 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Use headers in the check for _beginthreadex for w32threads
  avutil: Use a configure check to enable windows console functions
  avutil: Include io.h with a separate condition from windows console functions

Conflicts:
libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/ffmpeg-filters: add short description
Stefano Sabatini [Sat, 1 Dec 2012 12:05:25 +0000 (13:05 +0100)]
doc/ffmpeg-filters: add short description

7 years agotests/ref/seek/lavf_gif: update for 9d5cfce85540: gifdec: rudimentary seeking
Michael Niedermayer [Sat, 1 Dec 2012 11:56:12 +0000 (12:56 +0100)]
tests/ref/seek/lavf_gif: update for 9d5cfce85540: gifdec: rudimentary seeking

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agogifdec: rudimentary seeking
Paul B Mahol [Sat, 1 Dec 2012 11:07:50 +0000 (11:07 +0000)]
gifdec: rudimentary seeking

With this ffplay -loop X successfully seeks to start.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agogifdec: use av_fast_malloc()
Paul B Mahol [Sat, 1 Dec 2012 10:53:22 +0000 (10:53 +0000)]
gifdec: use av_fast_malloc()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoshorten: return more meaningful error codes
Paul B Mahol [Sat, 1 Dec 2012 10:13:18 +0000 (10:13 +0000)]
shorten: return more meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agows-snd1: return meaningful error code
Paul B Mahol [Sat, 1 Dec 2012 10:00:16 +0000 (10:00 +0000)]
ws-snd1: return meaningful error code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agownv1: return more meaningful error codes
Paul B Mahol [Sat, 1 Dec 2012 09:51:52 +0000 (09:51 +0000)]
wnv1: return more meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoxldec: K&R formatting cosmetics
Paul B Mahol [Sat, 1 Dec 2012 09:33:20 +0000 (09:33 +0000)]
xldec: K&R formatting cosmetics

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoxldec: return meaningful error code
Paul B Mahol [Sat, 1 Dec 2012 09:26:36 +0000 (09:26 +0000)]
xldec: return meaningful error code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agomotionpixels: use meaningful error code
Paul B Mahol [Sat, 1 Dec 2012 09:18:21 +0000 (09:18 +0000)]
motionpixels: use meaningful error code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agomvi: check av_mallocz() result
Paul B Mahol [Sat, 1 Dec 2012 09:03:24 +0000 (09:03 +0000)]
mvi: check av_mallocz() result

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoswscale: fix 12 and 14 bit YUV planar output with scaling.
Michael Niedermayer [Sat, 1 Dec 2012 02:31:48 +0000 (03:31 +0100)]
swscale: fix 12 and 14 bit YUV planar output with scaling.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopcmdec: check codec_id
Michael Niedermayer [Sat, 1 Dec 2012 01:36:01 +0000 (02:36 +0100)]
pcmdec: check codec_id

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocheck std tag size before reading.
Michael Niedermayer [Fri, 30 Nov 2012 23:29:39 +0000 (00:29 +0100)]
check std tag size before reading.

Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoqdm2: check array index before use, fix out of array accesses
Michael Niedermayer [Fri, 30 Nov 2012 22:59:40 +0000 (23:59 +0100)]
qdm2: check array index before use, fix out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaacps: check iid/icc_par more completely.
Michael Niedermayer [Fri, 30 Nov 2012 18:24:56 +0000 (19:24 +0100)]
aacps: check iid/icc_par more completely.

Fixes global out of array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodxa: check reference frame availability before use.
Michael Niedermayer [Fri, 30 Nov 2012 19:58:26 +0000 (20:58 +0100)]
dxa: check reference frame availability before use.

Fix NULL pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoupdate Changelog
Paul B Mahol [Fri, 30 Nov 2012 16:51:44 +0000 (16:51 +0000)]
update Changelog

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agogifdec: remove width and height from demuxer context
Paul B Mahol [Fri, 30 Nov 2012 16:09:02 +0000 (16:09 +0000)]
gifdec: remove width and height from demuxer context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosmacker: more complete vlc length check, fixes out of array read
Michael Niedermayer [Fri, 30 Nov 2012 15:00:07 +0000 (16:00 +0100)]
smacker: more complete vlc length check, fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosmacker: check smacker_decode_tree() return value
Michael Niedermayer [Fri, 30 Nov 2012 14:58:19 +0000 (15:58 +0100)]
smacker: check smacker_decode_tree() return value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoundo file modifiers that suck in
Paul B Mahol [Fri, 30 Nov 2012 15:00:35 +0000 (15:00 +0000)]
undo file modifiers that suck in

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoconfigure: Use headers in the check for _beginthreadex for w32threads
Martin Storsjö [Fri, 30 Nov 2012 14:57:02 +0000 (16:57 +0200)]
configure: Use headers in the check for _beginthreadex for w32threads

When targeting the metro API subset, this function still exists in
the link libraries, but is excluded from the headers. This makes
sure w32threads is automatically disabled when targeting this API
subset (since not all the necessary functions for it are available).

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoavutil: Use a configure check to enable windows console functions
Martin Storsjö [Fri, 30 Nov 2012 14:56:57 +0000 (16:56 +0200)]
avutil: Use a configure check to enable windows console functions

Not all versions or API subsets of windows have these functions.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoavutil: Include io.h with a separate condition from windows console functions
Martin Storsjö [Fri, 30 Nov 2012 14:56:54 +0000 (16:56 +0200)]
avutil: Include io.h with a separate condition from windows console functions

Not all versions of windows have the console color functions,
while io.h might be needed for isatty (which can be found in
unistd.h or io.h).

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoAdd exception for "gif" in image2 probe() method.
Vitaliy E Sugrobov [Fri, 30 Nov 2012 08:58:57 +0000 (12:58 +0400)]
Add exception for "gif" in image2 probe() method.

Without this exception files with ".gif" extension by default
recognized as input suitable for image2 demuxer rather than gif.
In order to pass image through gif demuxer it was necessary
to use -f gif option.
This change affected 'make fate' test results because previously
image2 demuxer and gif decoder took only first frame of multiframe
test data, which is no longer true with gif demuxer.

Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
7 years agoGif demuxer
Vitaliy E Sugrobov [Fri, 30 Nov 2012 08:58:56 +0000 (12:58 +0400)]
Gif demuxer

Gif demuxer is capable of extracting multiple frames from gif file.
In conjunction with gif decoder it implements support for reading
animated gifs.
Demuxer has two options available to user: default_delay and min_delay.
These options are for protection from too rapid gif animations. In practice
it is standard approach to slow down rendering of this kind of gifs. If you try to
play gif with delay between frames of one hundredth of second (100fps) using
one of major web browsers, you get significantly slower playback,
around 10 fps. This is because browser detects that delay value is less than some
threshold (usually 2 hundredths of second) and reset it to default value (usually 10
hundredths of second, which corresponds to 10fps). Manipulating these options user
can achieve the same effect during conversion to some video format. Otherwise user
can set them to not protect from rapid animations at all.
The other case when these options necessary is for gif images encoded according to
gif87a standard since prior to gif89a there was no delay information included in file.
Bump lavf minor version.

Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
7 years agoMove some definitions to header file.
Vitaliy E Sugrobov [Fri, 30 Nov 2012 08:58:55 +0000 (12:58 +0400)]
Move some definitions to header file.

Share them with upcoming demuxer module.

Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
7 years agoAdditional checks to prevent overread.
Vitaliy E Sugrobov [Fri, 30 Nov 2012 08:58:54 +0000 (12:58 +0400)]
Additional checks to prevent overread.

Check for availability of some required amount of bytes in buffer before
reading further.

Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
7 years agoPrepare gif decoder for use in conjunction with gif demuxer.
Vitaliy E Sugrobov [Fri, 30 Nov 2012 08:58:53 +0000 (12:58 +0400)]
Prepare gif decoder for use in conjunction with gif demuxer.

Add capability of reading multiple frames instead of only first.
Implement support for different gif frame 'disposal methods'.
Add option that allows to change background color resulting from
conversion of gif with transparency to any other format which
not support it.
Also bump lavc minor version.

Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
7 years agoAdd meaningful error codes and constants.
Vitaliy E Sugrobov [Fri, 30 Nov 2012 08:58:52 +0000 (12:58 +0400)]
Add meaningful error codes and constants.

Replace literals with named constants in several pieces of code
like 'return -1' and 'case 0xab'.
Change the way decoder handles absence of image data in a file:
notify gif_decode_frame() caller with got_picture set to zero
instead of returning -1.

Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 30 Nov 2012 13:55:04 +0000 (14:55 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avutil: Include io.h with a separate condition from MapViewOfFile
  cmdutils: Use a configure check for enabling CommandLineToArgvW

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320'
Michael Niedermayer [Fri, 30 Nov 2012 13:49:13 +0000 (14:49 +0100)]
Merge commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320'

* commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320':
  build: The FLAC encoder also depends on the flacdsp code
  img2: K&R formatting cosmetics
  h264: check context state before decoding slice data partitions
  flashsv: make sure data for zlib priming is available

Conflicts:
libavcodec/Makefile
libavformat/img2.c
libavformat/img2dec.c
libavformat/img2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: add lavfi avr dep to .pc when required.
Clément Bœsch [Fri, 30 Nov 2012 13:19:14 +0000 (14:19 +0100)]
configure: add lavfi avr dep to .pc when required.

7 years agoadpcm/thp: cosmetics: reindent
Paul B Mahol [Fri, 30 Nov 2012 10:48:37 +0000 (10:48 +0000)]
adpcm/thp: cosmetics: reindent

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoiff: fix some incorrect interpretations of invalid files
Paul B Mahol [Fri, 30 Nov 2012 10:44:00 +0000 (10:44 +0000)]
iff: fix some incorrect interpretations of invalid files

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoiff: MAUD support
Paul B Mahol [Thu, 29 Nov 2012 10:45:28 +0000 (10:45 +0000)]
iff: MAUD support

Based on patch by Piotr Bandurski
Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoCorrectly skip strf tag for subtitles when decoding avi.
Carl Eugen Hoyos [Fri, 30 Nov 2012 09:18:37 +0000 (10:18 +0100)]
Correctly skip strf tag for subtitles when decoding avi.

Fixes ticket #1797.

7 years agolavc: fix duplicate stats_out line.
Michael Niedermayer [Fri, 30 Nov 2012 04:31:41 +0000 (05:31 +0100)]
lavc: fix duplicate stats_out line.

Found-by: Thierry Foucu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomjpegdec: print error message when quant_index is invalid
Michael Niedermayer [Fri, 30 Nov 2012 03:00:05 +0000 (04:00 +0100)]
mjpegdec: print error message when quant_index is invalid

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