ffmpeg.git
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 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 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 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 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 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>
7 years agovc1dec: avoid == -1 checks for errors.
Michael Niedermayer [Tue, 27 Mar 2012 11:21:28 +0000 (13:21 +0200)]
vc1dec: avoid == -1 checks for errors.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovc1dec: sanity check state used in get_mvdata_interlaced()
Michael Niedermayer [Tue, 27 Mar 2012 11:20:51 +0000 (13:20 +0200)]
vc1dec: sanity check state used in get_mvdata_interlaced()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooma: dont over-read buffer
Michael Niedermayer [Tue, 27 Mar 2012 10:52:53 +0000 (12:52 +0200)]
oma: dont over-read buffer

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 27 Mar 2012 09:52:08 +0000 (11:52 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  make av_interleaved_write_frame() flush packets when pkt is NULL
  mpegts: Fix dead error checks
  vc1: Do not read from array if index is invalid.
  targa: convert to bytestream2.
  rv34: set mb_num_left to 0 after finishing a frame

Conflicts:
libavcodec/targa.c
libavcodec/vc1data.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: Do not explicitly add the doc directory to the OBJDIRS list.
Diego Biurrun [Mon, 26 Mar 2012 13:10:12 +0000 (15:10 +0200)]
build: Do not explicitly add the doc directory to the OBJDIRS list.

Now that a documentation generator is built in the doc directory,
this is no longer necessary.  Fixes the Make warning:
Makefile:188: target `doc' given more than once in the same rule.

7 years agodv: Split off DV video decoder into its own file.
Diego Biurrun [Sun, 18 Mar 2012 18:01:45 +0000 (19:01 +0100)]
dv: Split off DV video decoder into its own file.

7 years agobuild: fix RALF decoder standalone compilation, which depends on Golomb code
Diego Biurrun [Mon, 26 Mar 2012 23:04:45 +0000 (01:04 +0200)]
build: fix RALF decoder standalone compilation, which depends on Golomb code

7 years agoconfigure: Drop stray duplicate entry for --disable-fft from help output.
Diego Biurrun [Mon, 26 Mar 2012 11:36:06 +0000 (13:36 +0200)]
configure: Drop stray duplicate entry for --disable-fft from help output.

7 years agomake av_interleaved_write_frame() flush packets when pkt is NULL
Jindrich Makovicka [Wed, 21 Mar 2012 10:42:32 +0000 (11:42 +0100)]
make av_interleaved_write_frame() flush packets when pkt is NULL

This patch allows the user to force flushing of all queued packets
by calling av_interleaved_write_frame() with pkt set to NULL.

Signed-off-by: Jindrich Makovicka <jindrich.makovicka@nangu.tv>
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agodoc: clarify dshow input requirements
Compn [Tue, 27 Mar 2012 02:18:48 +0000 (22:18 -0400)]
doc: clarify dshow input requirements

7 years agoj2kdec: remove pointless swapping
Paul B Mahol [Tue, 27 Mar 2012 01:15:20 +0000 (01:15 +0000)]
j2kdec: remove pointless swapping

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2kdec: vertically align AVCodec members
Paul B Mahol [Mon, 26 Mar 2012 23:32:30 +0000 (23:32 +0000)]
j2kdec: vertically align AVCodec members

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2kdec: Remove useless .pix_fmts.
Paul B Mahol [Mon, 26 Mar 2012 23:32:30 +0000 (23:32 +0000)]
j2kdec: Remove useless .pix_fmts.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2kdec: convert to bytestream2 API
Paul B Mahol [Mon, 26 Mar 2012 23:32:29 +0000 (23:32 +0000)]
j2kdec: convert to bytestream2 API

Protects against overreads.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegts: Fix dead error checks
Alex Converse [Mon, 26 Mar 2012 22:51:59 +0000 (15:51 -0700)]
mpegts: Fix dead error checks

7 years agovc1: Do not read from array if index is invalid.
Mashiat Sarker Shakkhar [Sat, 24 Mar 2012 22:49:34 +0000 (15:49 -0700)]
vc1: Do not read from array if index is invalid.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agotarga: convert to bytestream2.
Ronald S. Bultje [Tue, 27 Mar 2012 00:46:16 +0000 (17:46 -0700)]
targa: convert to bytestream2.

Also remove some write-only variables or write-only variable
assignments, remove internal colorspace conversion to native
endianness (that can be done by swscale much more efficiently),
and some cosmetics.

7 years agoffmpeg: fix handling or empty audio packets
Michael Niedermayer [Tue, 27 Mar 2012 00:43:40 +0000 (02:43 +0200)]
ffmpeg: fix handling or empty audio packets

Fixes Ticket1131

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: more verbose error messages in case of audio encoding failure.
Michael Niedermayer [Tue, 27 Mar 2012 00:30:08 +0000 (02:30 +0200)]
ffmpeg: more verbose error messages in case of audio encoding failure.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRevert "raw: move buffer size check up."
Michael Niedermayer [Tue, 27 Mar 2012 00:11:03 +0000 (02:11 +0200)]
Revert "raw: move buffer size check up."

This reverts commit cc5dd632cecc5114717d0b90f8c2be162b1c6ee8.
The change was redundant, it has been fixed long ago (422e3a7)

Conflicts:

libavcodec/rawdec.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorv34: set mb_num_left to 0 after finishing a frame
Ronald S. Bultje [Mon, 26 Mar 2012 22:20:02 +0000 (00:20 +0200)]
rv34: set mb_num_left to 0 after finishing a frame

Prevents running error resilience on a previous frame which will write
to the pic->mb_type[] array of the previous image. The array might
already be re-used for a new image in a subsequent thread, thus cause
two threads to write to the same pic->mb_type[] array, causing a race
condition which can crash in rv34_decode_cbp(), called by
rv34_decode_inter_mb_header() (which accesses mb_type[] twice,
assuming values are maintained, which the race condition breaks).

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoj2kenc: cosmetics: vertically align AVCodec members.
Paul B Mahol [Mon, 26 Mar 2012 20:19:01 +0000 (20:19 +0000)]
j2kenc: cosmetics: vertically align AVCodec members.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibopenjpegdec: hack to fix GRAY16 decoding
Paul B Mahol [Sun, 25 Mar 2012 23:31:31 +0000 (23:31 +0000)]
libopenjpegdec: hack to fix GRAY16 decoding

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovc1dec: move mquant zero check down.
Michael Niedermayer [Mon, 26 Mar 2012 22:44:32 +0000 (00:44 +0200)]
vc1dec: move mquant zero check down.

This way it catches all cases, and prevents later segfaults.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotarga: Fix input buffer size check.
Michael Niedermayer [Mon, 26 Mar 2012 22:12:03 +0000 (00:12 +0200)]
targa: Fix input buffer size check.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRELEASE: bump to current version (0.10.2).
Clément Bœsch [Mon, 26 Mar 2012 20:46:03 +0000 (22:46 +0200)]
RELEASE: bump to current version (0.10.2).

7 years agoAPIchanges: fill in missing dates and hashes.
Clément Bœsch [Mon, 26 Mar 2012 20:43:10 +0000 (22:43 +0200)]
APIchanges: fill in missing dates and hashes.

7 years agoaac: reference supported sample rates in encoders.
Clément Bœsch [Mon, 26 Mar 2012 20:32:17 +0000 (22:32 +0200)]
aac: reference supported sample rates in encoders.

7 years agoffmpeg: more expressive sample rate automatic selection.
Clément Bœsch [Tue, 20 Mar 2012 15:19:49 +0000 (16:19 +0100)]
ffmpeg: more expressive sample rate automatic selection.

Output now lists the available sample rates with commands like
ffmpeg -f lavfi -i aevalsrc=0 -ar 20000 -y /tmp/out.mp3

7 years agolavfi: add avfilter_fill_frame_from_{audio_,}buffer_ref().
Clément Bœsch [Tue, 14 Feb 2012 16:00:53 +0000 (17:00 +0100)]
lavfi: add avfilter_fill_frame_from_{audio_,}buffer_ref().

7 years agoindeo3dec: check mv bitstream pointer
Michael Niedermayer [Mon, 26 Mar 2012 20:11:53 +0000 (22:11 +0200)]
indeo3dec: check mv bitstream pointer

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoindeo3dec: Fix end pointer.
Michael Niedermayer [Mon, 26 Mar 2012 20:06:54 +0000 (22:06 +0200)]
indeo3dec: Fix end pointer.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 26 Mar 2012 18:34:29 +0000 (20:34 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: ppc: drop stray leftover backslash
  build: Only clean the architecture subdirectory we build for.
  build: drop some unnecessary dependencies from the H.264 parser
  build: prettyprinting cosmetics
  libavutil: Remove pointless rational test program.
  libavutil: Remove broken and pointless lzo test program.
  lavf doxy: expand AVStream.codec doxy.
  lavf doxy: improve AVStream.time_base doxy.
  lavf doxy: add some basic documentation about reading from the demuxer.
  lavf doxy: document passing options to demuxers.
  lavf doxy: clarify that an AVPacket contains encoded data.
  mpegtsenc: allow user triggered PES packet flushing
  APIchanges: mark the place where 0.7 was cut.
  APIchanges: mark the place where 0.8 was cut.
  APIchanges: fill in missing dates and hashes.
  smacker: convert palette and header reading to bytestream2.
  alac: convert extradata reading to bytestream2.

Conflicts:
doc/APIchanges
libavcodec/smacker.c
libavcodec/x86/Makefile
libavfilter/Makefile
libavutil/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoEnable generic index/seeking for mgsts demuxer.
Reimar Döffinger [Sun, 25 Mar 2012 11:25:42 +0000 (13:25 +0200)]
Enable generic index/seeking for mgsts demuxer.

This depends on the proposed parser change for 0-size packets
in previous mail, otherwise video now plays far too fast.

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