ffmpeg.git
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 27 Dec 2011 00:19:04 +0000 (01:19 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: split off vqf/twinvq FATE tests into their own file
  fate: split off mpc FATE tests into their own file
  fate: split off libavcodec FATE tests into their own file
  fate: split off Microsoft codec FATE tests into their own file
  fate: group all VP* codec FATE tests together in one file
  swscale: prevent invalid writes in packed_16bpc_bswap

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: warn if SAMPLES is not specified.
Clément Bœsch [Thu, 22 Dec 2011 15:22:48 +0000 (16:22 +0100)]
fate: warn if SAMPLES is not specified.

7 years agofate: give stderr hint when a test fails.
Clément Bœsch [Thu, 22 Dec 2011 17:17:13 +0000 (18:17 +0100)]
fate: give stderr hint when a test fails.

7 years agofate: add generic rules for most of the tests/fate/*.mak files.
Clément Bœsch [Thu, 22 Dec 2011 15:13:03 +0000 (16:13 +0100)]
fate: add generic rules for most of the tests/fate/*.mak files.

7 years agodv: fix avpriv_dv_codec_profile with lowres > 0
Marton Balint [Sun, 25 Dec 2011 18:31:23 +0000 (19:31 +0100)]
dv: fix avpriv_dv_codec_profile with lowres > 0

Fixes ticket #44.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoid3v2: fix variable type for uncompress()
Michael Niedermayer [Mon, 26 Dec 2011 20:35:21 +0000 (21:35 +0100)]
id3v2: fix variable type for uncompress()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoProcess compressed id3v2 tags.
Adrian Drzewiecki [Sat, 24 Dec 2011 19:06:22 +0000 (11:06 -0800)]
Process compressed id3v2 tags.

ID3v2.4 allows for zlib compressed tags, but libavformat skips them.
Implement code to inflate compressed tags.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: split off vqf/twinvq FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 22:19:03 +0000 (23:19 +0100)]
fate: split off vqf/twinvq FATE tests into their own file

7 years agofate: split off mpc FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 22:08:05 +0000 (23:08 +0100)]
fate: split off mpc FATE tests into their own file

7 years agofate: split off libavcodec FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 22:03:37 +0000 (23:03 +0100)]
fate: split off libavcodec FATE tests into their own file

7 years agofate: split off Microsoft codec FATE tests into their own file
Diego Biurrun [Wed, 14 Dec 2011 21:41:26 +0000 (22:41 +0100)]
fate: split off Microsoft codec FATE tests into their own file

7 years agofate: group all VP* codec FATE tests together in one file
Diego Biurrun [Wed, 14 Dec 2011 21:22:33 +0000 (22:22 +0100)]
fate: group all VP* codec FATE tests together in one file

7 years agoswscale: prevent invalid writes in packed_16bpc_bswap
Janne Grunau [Mon, 26 Dec 2011 12:38:39 +0000 (13:38 +0100)]
swscale: prevent invalid writes in packed_16bpc_bswap

Writes past the end of the destination buffer were occuring when its
stride was smaller than the stride of the source. Fixes Bug #183.

7 years agogxf: remove gxf_ prefix to timecode metadata keys.
Clément Bœsch [Thu, 15 Dec 2011 15:34:09 +0000 (16:34 +0100)]
gxf: remove gxf_ prefix to timecode metadata keys.

This will allow a shared "timecode" key metadata between formats to ease
third-party extraction.

7 years agotimecode: fix drop frame in avpriv_timecode_to_string().
Clément Bœsch [Mon, 26 Dec 2011 10:06:00 +0000 (11:06 +0100)]
timecode: fix drop frame in avpriv_timecode_to_string().

7 years agodv: add timecode to metadata
Matthieu Bouron [Thu, 22 Dec 2011 21:57:02 +0000 (22:57 +0100)]
dv: add timecode to metadata

Reviewed-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: fix non ANSI C for(int
Michael Niedermayer [Mon, 26 Dec 2011 03:14:50 +0000 (04:14 +0100)]
ffmpeg: fix non ANSI C for(int

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 26 Dec 2011 02:35:54 +0000 (03:35 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avs: call release_buffer() at the end.
  Add minor bumps and APIchanges entries for lavc/lavfi changes.
  mpegvideo.c: K&R formatting and cosmetics.
  avconv: avoid memcpy in vsrc_buffer when possible.
  avconv: implement get_buffer()/release_buffer().
  lavfi: add a new function av_buffersrc_buffer().
  lavfi: add avfilter_copy_frame_props()
  lavc: add format field to AVFrame
  lavc: add width and height fields to AVFrame
  lavc: add a sample_aspect_ratio field to AVFrame
  doxy: add website-alike style to the html output
  FAQ: add an entry for common error when using -profile

Conflicts:
avconv.c
cmdutils.c
doc/APIchanges
libavcodec/avcodec.h
libavcodec/mpegvideo.c
libavcodec/utils.c
libavcodec/version.h
libavfilter/Makefile
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/src_movie.c
libavfilter/vsrc_buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavs: call release_buffer() at the end.
Anton Khirnov [Sun, 25 Dec 2011 18:35:19 +0000 (19:35 +0100)]
avs: call release_buffer() at the end.

Fixes a memleak.

7 years agoAdd minor bumps and APIchanges entries for lavc/lavfi changes.
Anton Khirnov [Sun, 25 Dec 2011 17:24:14 +0000 (18:24 +0100)]
Add minor bumps and APIchanges entries for lavc/lavfi changes.

7 years agompegvideo.c: K&R formatting and cosmetics.
Konstantin Todorov [Sun, 25 Dec 2011 17:58:01 +0000 (09:58 -0800)]
mpegvideo.c: K&R formatting and cosmetics.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoff*: add -max_alloc command line option
Michael Niedermayer [Sun, 25 Dec 2011 17:44:36 +0000 (18:44 +0100)]
ff*: add -max_alloc command line option

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomem: add av_max_alloc() to limit the maximum amount that may be allocated in one...
Michael Niedermayer [Sun, 25 Dec 2011 17:43:58 +0000 (18:43 +0100)]
mem: add av_max_alloc() to limit the maximum amount that may be allocated in one piece

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoshorten: validate values in fmt chunk search
Michael Niedermayer [Sun, 25 Dec 2011 11:31:23 +0000 (12:31 +0100)]
shorten: validate values in fmt chunk search

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoshorten: Fix invalid free()
Michael Niedermayer [Sun, 25 Dec 2011 11:28:50 +0000 (12:28 +0100)]
shorten: Fix invalid free()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavconv: avoid memcpy in vsrc_buffer when possible.
Anton Khirnov [Wed, 21 Dec 2011 20:04:05 +0000 (21:04 +0100)]
avconv: avoid memcpy in vsrc_buffer when possible.

Decoding Sintel.2010.1080p.mkv with 4 threads on an i7 2600K goes from
260s to 244s.

7 years agoavconv: implement get_buffer()/release_buffer().
Anton Khirnov [Mon, 19 Dec 2011 14:44:58 +0000 (15:44 +0100)]
avconv: implement get_buffer()/release_buffer().

This will allow memcpy-free passing frames to lavfi.

7 years agolavfi: add a new function av_buffersrc_buffer().
Anton Khirnov [Wed, 21 Dec 2011 19:39:18 +0000 (20:39 +0100)]
lavfi: add a new function av_buffersrc_buffer().

It can be used to directly pass a AVFilterBufferRef to lavfi, avoiding a
memcpy.

7 years agolavfi: add avfilter_copy_frame_props()
Stefano Sabatini [Sun, 1 May 2011 12:47:05 +0000 (14:47 +0200)]
lavfi: add avfilter_copy_frame_props()

avfilter_copy_frame_props() avoids code duplication and increases
robustness.

7 years agolavc: add format field to AVFrame
Stefano Sabatini [Sun, 1 May 2011 12:10:20 +0000 (14:10 +0200)]
lavc: add format field to AVFrame

The format is a per-frame property, having it in AVFrame simplify the
operation of extraction of that information, since avoids the need to
access the codec/stream context.

7 years agolavc: add width and height fields to AVFrame
Stefano Sabatini [Sun, 1 May 2011 12:02:08 +0000 (14:02 +0200)]
lavc: add width and height fields to AVFrame

width and height are per-frame properties, setting these values in
AVFrame simplify the operation of extraction of that information,
since avoids the need to check the codec/stream context.

7 years agolavc: add a sample_aspect_ratio field to AVFrame
Stefano Sabatini [Fri, 29 Apr 2011 11:04:47 +0000 (13:04 +0200)]
lavc: add a sample_aspect_ratio field to AVFrame

The sample aspect ratio is a per-frame property, so it makes sense to
define it in AVFrame rather than in the codec/stream context.
Simplify application-level sample aspect ratio information extraction,
and allow further simplifications.

7 years agodoxy: add website-alike style to the html output
Gautam Gupta [Sun, 11 Dec 2011 18:02:17 +0000 (19:02 +0100)]
doxy: add website-alike style to the html output

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoFAQ: add an entry for common error when using -profile
Anton Khirnov [Sun, 25 Dec 2011 12:48:06 +0000 (13:48 +0100)]
FAQ: add an entry for common error when using -profile

7 years agosegafilm: fail earlier in case theres not enough bytestream left for a
Michael Niedermayer [Sun, 25 Dec 2011 03:49:23 +0000 (04:49 +0100)]
segafilm: fail earlier in case theres not enough bytestream left for a
audio packet.
This prevents a potentially large memory allocation.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavio: Fix ffio_limit() when due to seeking past the end less than 0 bytes remain.
Michael Niedermayer [Sun, 25 Dec 2011 03:48:26 +0000 (04:48 +0100)]
avio: Fix ffio_limit() when due to seeking past the end less than 0 bytes remain.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agogolomb: Fix infinite loop in svq3_get_ue_golomb()
Michael Niedermayer [Sun, 25 Dec 2011 03:15:56 +0000 (04:15 +0100)]
golomb: Fix infinite loop in svq3_get_ue_golomb()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agows_snd1: Fix wrong samples count and crash.
Michael Niedermayer [Sat, 24 Dec 2011 23:10:27 +0000 (00:10 +0100)]
ws_snd1: Fix wrong samples count and crash.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoasfdec: fix endless loop on EOF
Michael Niedermayer [Sat, 24 Dec 2011 22:21:40 +0000 (23:21 +0100)]
asfdec: fix endless loop on EOF

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosierravmd: limit packetsize to the amount that could be read.
Michael Niedermayer [Sat, 24 Dec 2011 21:06:25 +0000 (22:06 +0100)]
sierravmd: limit packetsize to the amount that could be read.
Fixes huge allocations.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovmdav: check that theres enough space for a chunk remaining.
Michael Niedermayer [Sat, 24 Dec 2011 21:03:59 +0000 (22:03 +0100)]
vmdav: check that theres enough space for a chunk remaining.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agormdec: Avoid allocating huge packets
Michael Niedermayer [Sat, 24 Dec 2011 20:26:52 +0000 (21:26 +0100)]
rmdec: Avoid allocating huge packets

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg4videodec: Fix division by zero in mpeg4_decode_sprite_trajectory()
Michael Niedermayer [Sat, 24 Dec 2011 19:27:54 +0000 (20:27 +0100)]
mpeg4videodec: Fix division by zero in mpeg4_decode_sprite_trajectory()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorpl: Fix near infinite loop in index reading due to missing eof check.
Michael Niedermayer [Sat, 24 Dec 2011 18:57:18 +0000 (19:57 +0100)]
rpl: Fix near infinite loop in index reading due to missing eof check.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2kdec: Fix crash in get_qcx
Michael Niedermayer [Sat, 24 Dec 2011 05:17:12 +0000 (06:17 +0100)]
j2kdec: Fix crash in get_qcx

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2kdec: Check curtileno for validity
Michael Niedermayer [Sat, 24 Dec 2011 04:06:20 +0000 (05:06 +0100)]
j2kdec: Check curtileno for validity

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2kdec: Check for interger overflow in tile array allocation
Michael Niedermayer [Sat, 24 Dec 2011 04:03:04 +0000 (05:03 +0100)]
j2kdec: Check for interger overflow in tile array allocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2kdec: fix division by zero, check tile dimensions for validity
Michael Niedermayer [Sat, 24 Dec 2011 03:59:25 +0000 (04:59 +0100)]
j2kdec: fix division by zero, check tile dimensions for validity

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolzo: fix memcpy_backptr() with 0 offset
Michael Niedermayer [Sat, 24 Dec 2011 02:55:58 +0000 (03:55 +0100)]
lzo: fix memcpy_backptr() with 0 offset

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_drawtext: select YUV color for drawbox() in case YUV colorspace is used
Stefano Sabatini [Sat, 24 Dec 2011 15:17:18 +0000 (16:17 +0100)]
vf_drawtext: select YUV color for drawbox() in case YUV colorspace is used

Fix box alpha rendering when a YUV colorspace is selected, in particular
fix trac ticket #763.

7 years agoMake the palette in Quake II CIN files opaque and increase its dynamics.
Carl Eugen Hoyos [Sat, 24 Dec 2011 11:44:30 +0000 (12:44 +0100)]
Make the palette in Quake II CIN files opaque and increase its dynamics.

7 years agoMake the palette in Wing Commander III mve files opaque.
Carl Eugen Hoyos [Sat, 24 Dec 2011 11:41:44 +0000 (12:41 +0100)]
Make the palette in Wing Commander III mve files opaque.

7 years agoMake mov palette opaque or load alpha if present.
Carl Eugen Hoyos [Sat, 24 Dec 2011 11:38:32 +0000 (12:38 +0100)]
Make mov palette opaque or load alpha if present.

7 years agoMake the avi palette opaque.
Carl Eugen Hoyos [Sat, 24 Dec 2011 02:41:50 +0000 (03:41 +0100)]
Make the avi palette opaque.

7 years agodoc: build: TEXIDEP: Recognize verbatim includes
Alexander Strasser [Mon, 19 Dec 2011 23:27:22 +0000 (00:27 +0100)]
doc: build: TEXIDEP: Recognize verbatim includes

  When generating the .dep files for .texi sources, verbatim includes
(@verbatiminclude) should also be taken into account.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: Try to find fate_config.sh.template in source path
Alexander Strasser [Sat, 24 Dec 2011 00:28:30 +0000 (01:28 +0100)]
build: Try to find fate_config.sh.template in source path

  The FATE documentation depends on the mentioned file. But that
did break out of tree builds because the file was not found.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibopenjpeg: support decoding with bits per pixel greater than 8
Jean First [Thu, 22 Dec 2011 21:26:21 +0000 (22:26 +0100)]
libopenjpeg: support decoding with bits per pixel greater than 8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Approved-by: Alex Zhukov
7 years agoMerge remote-tracking branch 'shariman/wmall'
Michael Niedermayer [Sat, 24 Dec 2011 00:54:25 +0000 (01:54 +0100)]
Merge remote-tracking branch 'shariman/wmall'

* shariman/wmall:
  Perform dequantization of channel coefficients
  Perform inverse inter-channel decorrelation and ac-filter
  Implement revert_inter_ch_decorr() and revert_acfilter()
  Enable inverse-MCLMS filter
  Fix inverse-MCLMS filtering routines
  Do not update buffers in case no speed change is necessary
  Use int for channel_coeffs instead of int16_t

Conflicts:
libavcodec/wmalosslessdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorelease_notes: merge back changes from our 0.9 to master
Michael Niedermayer [Sat, 24 Dec 2011 00:13:46 +0000 (01:13 +0100)]
release_notes: merge back changes from our 0.9 to master
seems i have forgotten this

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRELEASE_NOTES: remove possibly ofensive sounding wording
Michael Niedermayer [Sun, 11 Dec 2011 20:11:40 +0000 (21:11 +0100)]
RELEASE_NOTES: remove possibly ofensive sounding wording
from after the merge that i missed and do other general cleanup

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 23 Dec 2011 23:45:02 +0000 (00:45 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vp3dec: Check coefficient index in vp3_dequant()
  svq1dec: call avcodec_set_dimensions() after dimensions changed.
  Prepare for 0.8_beta1 snapshot release
  threads: check defines before using them in automatic thread detection
  pthread: include sys/types.h before sys/sysctl.h
  4xm: remove unused variables.
  h264: Fix a possible overread in decode_nal_units()
  allfilters: fix type of avfilter_vsrc_buffer.
  w32thread: call ResetEvent() in pthread_cond_broadcast().

Conflicts:
Changelog
RELEASE
doc/RELEASE_NOTES
libavcodec/pthread.c
libavcodec/vp3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavio: fix handling of , in urls
Michael Niedermayer [Fri, 23 Dec 2011 22:59:10 +0000 (23:59 +0100)]
avio: fix handling of , in urls
Fixes Ticket805

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: fix swresample_version()
Michael Niedermayer [Fri, 23 Dec 2011 22:26:02 +0000 (23:26 +0100)]
swr: fix swresample_version()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoflvdec: disable new midstream param change code not only for h264 but all cases.
Michael Niedermayer [Fri, 23 Dec 2011 18:52:15 +0000 (19:52 +0100)]
flvdec: disable new midstream param change code not only for h264 but all cases.
It breaks some samples and iam not aware of one that it fixes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRevert "doc: build: TEXIDEP: Recognize verbatim includes"
Michael Niedermayer [Fri, 23 Dec 2011 17:01:10 +0000 (18:01 +0100)]
Revert "doc: build: TEXIDEP: Recognize verbatim includes"

This reverts commit e5cbf24e45ed21178674fff8f485d919128b793c.

This commits breaks out of tree builds

7 years agopthread: sysctl.h needs param.h on openbsd
Michael Niedermayer [Fri, 23 Dec 2011 15:34:46 +0000 (16:34 +0100)]
pthread: sysctl.h needs param.h on openbsd

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agothreads: check defines before using them in automatic thread detection
Janne Grunau [Fri, 23 Dec 2011 10:10:37 +0000 (11:10 +0100)]
threads: check defines before using them in automatic thread detection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopthread: include sys/types.h before sys/sysctl.h
Janne Grunau [Fri, 23 Dec 2011 09:14:15 +0000 (10:14 +0100)]
pthread: include sys/types.h before sys/sysctl.h

Fixes compilation on FreeBSD with clang 3.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovp3dec: Check coefficient index in vp3_dequant()
Reinhard Tartler [Sun, 4 Dec 2011 09:10:33 +0000 (10:10 +0100)]
vp3dec: Check coefficient index in vp3_dequant()

Based on a patch by Michael Niedermayer <michaelni@gmx.at>

Fixes NGS00145, CVE-2011-4352

Found-by: Phillip Langlois
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agosvq1dec: call avcodec_set_dimensions() after dimensions changed.
Michael Niedermayer [Fri, 18 Nov 2011 18:10:21 +0000 (19:10 +0100)]
svq1dec: call avcodec_set_dimensions() after dimensions changed.

Fixes NGS00148, CVE-2011-4579

Found-by: Phillip Langlois
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoPrepare for 0.8_beta1 snapshot release
Reinhard Tartler [Sun, 6 Nov 2011 10:12:04 +0000 (11:12 +0100)]
Prepare for 0.8_beta1 snapshot release

7 years agothreads: check defines before using them in automatic thread detection
Janne Grunau [Fri, 23 Dec 2011 10:10:37 +0000 (11:10 +0100)]
threads: check defines before using them in automatic thread detection

7 years agopthread: include sys/types.h before sys/sysctl.h
Janne Grunau [Fri, 23 Dec 2011 09:14:15 +0000 (10:14 +0100)]
pthread: include sys/types.h before sys/sysctl.h

Fixes compilation on FreeBSD with clang 3.

7 years agoMake systematic palette opaque.
Carl Eugen Hoyos [Fri, 23 Dec 2011 10:43:29 +0000 (11:43 +0100)]
Make systematic palette opaque.

7 years agoRelease buffers after encoding svq1.
Carl Eugen Hoyos [Fri, 23 Dec 2011 10:39:41 +0000 (11:39 +0100)]
Release buffers after encoding svq1.

Fixes ticket #820.

7 years agoFix a possible endless loop when decoding aac.
Carl Eugen Hoyos [Fri, 23 Dec 2011 10:38:37 +0000 (11:38 +0100)]
Fix a possible endless loop when decoding aac.

Fixes ticket #789.

7 years ago4xm: remove unused variables.
Anton Khirnov [Thu, 22 Dec 2011 14:40:26 +0000 (15:40 +0100)]
4xm: remove unused variables.

7 years agoh264: Fix a possible overread in decode_nal_units()
Alexander Strange [Mon, 12 Dec 2011 23:13:39 +0000 (18:13 -0500)]
h264: Fix a possible overread in decode_nal_units()

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoPerform dequantization of channel coefficients
Mashiat Sarker Shakkhar [Fri, 23 Dec 2011 07:21:33 +0000 (13:21 +0600)]
Perform dequantization of channel coefficients

7 years agoPerform inverse inter-channel decorrelation and ac-filter
Mashiat Sarker Shakkhar [Fri, 23 Dec 2011 07:23:10 +0000 (13:23 +0600)]
Perform inverse inter-channel decorrelation and ac-filter

7 years agoImplement revert_inter_ch_decorr() and revert_acfilter()
Mashiat Sarker Shakkhar [Fri, 23 Dec 2011 07:17:28 +0000 (13:17 +0600)]
Implement revert_inter_ch_decorr() and revert_acfilter()

7 years agoallfilters: fix type of avfilter_vsrc_buffer.
Anton Khirnov [Thu, 22 Dec 2011 16:32:29 +0000 (17:32 +0100)]
allfilters: fix type of avfilter_vsrc_buffer.

7 years agolibavfilter: increase LIBAVFILTER_VERSION_MICRO to 100 like the other libs.
Michael Niedermayer [Fri, 23 Dec 2011 05:01:20 +0000 (06:01 +0100)]
libavfilter: increase LIBAVFILTER_VERSION_MICRO to 100 like the other libs.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: Decode short VUI without error
Michael Niedermayer [Fri, 23 Dec 2011 04:58:32 +0000 (05:58 +0100)]
h264: Decode short VUI without error
Fixes 47j9R7PXBep.mov

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agow32thread: call ResetEvent() in pthread_cond_broadcast().
Sergey Radionov [Fri, 23 Dec 2011 03:37:48 +0000 (10:37 +0700)]
w32thread: call ResetEvent() in pthread_cond_broadcast().

Also add "volatile" to broadcast flag (since it is used from
multiple threads).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 23 Dec 2011 02:00:12 +0000 (03:00 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: fix standalone compilation of OMA muxer
  build: fix standalone compilation of Microsoft XMV demuxer
  build: fix standalone compilation of Core Audio Format demuxer
  kvmc: fix invalid reads
  4xm: Add a check in decode_i_frame to prevent buffer overreads
  adpcm: fix IMA SMJPEG decoding
  options: set minimum for "threads" to zero
  bsd: use number of logical CPUs as automatic thread count
  windows: use number of CPUs as automatic thread count
  linux: use number of CPUs as automatic thread count
  pthreads: reset active_thread_type when slice thread_init returrns early
  v410dec: include correct headers
  Drop ALT_ prefix from BITSTREAM_READER_LE name.
  lavfi: always build vsrc_buffer.
  ra144enc: zero the reflection coeffs if the filter is unstable
  sws: readd PAL8 to isPacked()
  mov: Don't stick the QuickTime field ordering atom in extradata.
  truespeech: fix invalid reads in truespeech_apply_twopoint_filter()

Conflicts:
configure
libavcodec/4xm.c
libavcodec/avcodec.h
libavfilter/Makefile
libavfilter/allfilters.c
libavformat/Makefile
libswscale/swscale_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoudp: support non blocking reads with fifo
Michael Niedermayer [Fri, 23 Dec 2011 00:51:47 +0000 (01:51 +0100)]
udp: support non blocking reads with fifo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoudp: Replace double select() by select+mutex+cond.
Michael Niedermayer [Fri, 23 Dec 2011 00:17:18 +0000 (01:17 +0100)]
udp: Replace double select() by select+mutex+cond.

When no data was available both the buffer thread as well as
the main thread would block in select(), when data becomes
available both should move forward and as data is read in the
buffer thread the main thread would block in select() later
the read data was put in the fifo but the main thread still
would be blocked in select() until either the timeout or
another packet would come in.

This is solved in this commit by using a mutex and a condition
variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoudp: return circular buffer error if such error happened.
Michael Niedermayer [Fri, 23 Dec 2011 00:41:15 +0000 (01:41 +0100)]
udp: return circular buffer error if such error happened.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: fix standalone compilation of OMA muxer
Diego Biurrun [Thu, 22 Dec 2011 20:10:38 +0000 (21:10 +0100)]
build: fix standalone compilation of OMA muxer

The muxer depends on the id3v2 writing code, so link against it.

7 years agobuild: fix standalone compilation of Microsoft XMV demuxer
Diego Biurrun [Thu, 22 Dec 2011 20:09:23 +0000 (21:09 +0100)]
build: fix standalone compilation of Microsoft XMV demuxer

The demuxer depends on the RIFF codec tags code, so link against it.

7 years agobuild: fix standalone compilation of Core Audio Format demuxer
Diego Biurrun [Thu, 22 Dec 2011 20:05:26 +0000 (21:05 +0100)]
build: fix standalone compilation of Core Audio Format demuxer

The demuxer depends on code from mov.c, which in turn depends on
code from mov_chan.c, so link against it.

7 years agofifo: Make writes atomic.
Michael Niedermayer [Thu, 22 Dec 2011 23:18:36 +0000 (00:18 +0100)]
fifo: Make writes atomic.
Prior to this a X bytes write could be seen as less than X bytes being
available if the check was done at an unfortunate moment.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agokvmc: fix invalid reads
Gaurav Narula [Mon, 12 Dec 2011 14:54:54 +0000 (20:24 +0530)]
kvmc: fix invalid reads

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
7 years ago4xm: Add a check in decode_i_frame to prevent buffer overreads
Shitiz Garg [Wed, 14 Dec 2011 12:59:21 +0000 (18:29 +0530)]
4xm: Add a check in decode_i_frame to prevent buffer overreads

Fixes bugzilla #135

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
7 years agoadpcm: fix IMA SMJPEG decoding
Paul B Mahol [Wed, 21 Dec 2011 19:27:53 +0000 (19:27 +0000)]
adpcm: fix IMA SMJPEG decoding

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
7 years agooptions: set minimum for "threads" to zero
Janne Grunau [Wed, 21 Dec 2011 00:37:44 +0000 (01:37 +0100)]
options: set minimum for "threads" to zero

A negative number of threads does not make sense and 0 is used for
autodetection. Adds a symbolic name for autodetection.

7 years agobsd: use number of logical CPUs as automatic thread count
Janne Grunau [Thu, 22 Dec 2011 20:10:07 +0000 (21:10 +0100)]
bsd: use number of logical CPUs as automatic thread count

7 years agowindows: use number of CPUs as automatic thread count
Janne Grunau [Wed, 21 Dec 2011 00:26:19 +0000 (01:26 +0100)]
windows: use number of CPUs as automatic thread count

7 years agolinux: use number of CPUs as automatic thread count
Janne Grunau [Wed, 21 Dec 2011 00:18:01 +0000 (01:18 +0100)]
linux: use number of CPUs as automatic thread count

Use sched_getaffinity to determine the number of logical CPUs.
Limits the number of threads to 16 since slice threading of H.264
seems to be buggy with more than 16 threads.