ffmpeg.git
7 years agoswr: move if() block into the only branch where it can be true.
Michael Niedermayer [Thu, 15 Nov 2012 11:22:16 +0000 (12:22 +0100)]
swr: move if() block into the only branch where it can be true.

This should make the code a tiny tiny bit faster.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: reorder/redesign operations to avoid integer overflow.
Michael Niedermayer [Thu, 15 Nov 2012 11:20:45 +0000 (12:20 +0100)]
swr: reorder/redesign operations to avoid integer overflow.

This fixes a out of array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffserver: fix streams and priv_data memleaks when closing a connection.
Clément Bœsch [Tue, 13 Nov 2012 15:32:35 +0000 (17:32 +0200)]
ffserver: fix streams and priv_data memleaks when closing a connection.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 15 Nov 2012 10:31:13 +0000 (11:31 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  bgmc: Fix av_malloc checks in ff_bgmc_init()
  rtp: set the payload type as stream id

Conflicts:
libavformat/rtpenc_chain.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '3b4296f41473a5b39e84d7a49d480624c9c60040'
Michael Niedermayer [Thu, 15 Nov 2012 10:12:25 +0000 (11:12 +0100)]
Merge commit '3b4296f41473a5b39e84d7a49d480624c9c60040'

* commit '3b4296f41473a5b39e84d7a49d480624c9c60040':
  avformat: clarify stream id for muxing
  fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests
  ppc: do not pass redundant compiler flags
  avutil: change GET_UTF8 to not use av_log2()
  segment: fix NULL pointer dereference in seg_write_header()

Conflicts:
tests/fate/aac.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoituh263dec: more complete w/h check.
Michael Niedermayer [Thu, 15 Nov 2012 01:43:38 +0000 (02:43 +0100)]
ituh263dec: more complete w/h check.

Fixes a division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorv10: always check image size not just in some cases.
Michael Niedermayer [Thu, 15 Nov 2012 01:16:56 +0000 (02:16 +0100)]
rv10: always check image size not just in some cases.

Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoxwma: check bytes_per_sample, fix division by 0.
Michael Niedermayer [Wed, 14 Nov 2012 23:56:33 +0000 (00:56 +0100)]
xwma: check bytes_per_sample, fix division by 0.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodxa: dont try to use the previous frame if there is none.
Michael Niedermayer [Wed, 14 Nov 2012 23:42:49 +0000 (00:42 +0100)]
dxa: dont try to use the previous frame if there is none.

Fixes null pointer dereference.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobink: check quant_index, fix out of array read
Michael Niedermayer [Wed, 14 Nov 2012 22:24:05 +0000 (23:24 +0100)]
bink: check quant_index, fix out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: Add option to disable all command line programs
Diego Biurrun [Sat, 10 Nov 2012 17:10:59 +0000 (18:10 +0100)]
configure: Add option to disable all command line programs

7 years agobgmc: Fix av_malloc checks in ff_bgmc_init()
Xi Wang [Wed, 14 Nov 2012 18:45:24 +0000 (13:45 -0500)]
bgmc: Fix av_malloc checks in ff_bgmc_init()

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agogifdec: check ff_lzw_decode_init() return value, fix out of array reads
Michael Niedermayer [Wed, 14 Nov 2012 21:59:22 +0000 (22:59 +0100)]
gifdec: check ff_lzw_decode_init() return value, fix out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowmaprodec: check num_sfb for validity. Fix out of array accesses
Michael Niedermayer [Wed, 14 Nov 2012 20:14:40 +0000 (21:14 +0100)]
wmaprodec: check num_sfb for validity. Fix out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat: clarify stream id for muxing
Luca Barbato [Sat, 10 Nov 2012 15:20:30 +0000 (16:20 +0100)]
avformat: clarify stream id for muxing

7 years agortp: set the payload type as stream id
Luca Barbato [Sun, 11 Nov 2012 19:44:28 +0000 (20:44 +0100)]
rtp: set the payload type as stream id

Support multiple video/audio streams with different format in the
same session.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agovpriv_adx_decode_header: avoid underreading the array.
Michael Niedermayer [Wed, 14 Nov 2012 18:15:32 +0000 (19:15 +0100)]
vpriv_adx_decode_header: avoid underreading the array.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovc1dec: require a minimum of 2x2 for the edge pos. Avoid assertion failure
Michael Niedermayer [Wed, 14 Nov 2012 18:03:07 +0000 (19:03 +0100)]
vc1dec: require a minimum of 2x2 for the edge pos. Avoid assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAdd missing dependency for avr demuxer
Paul B Mahol [Wed, 14 Nov 2012 18:00:17 +0000 (18:00 +0000)]
Add missing dependency for avr demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agovc1dec: check first field slices, fix out of array read.
Michael Niedermayer [Wed, 14 Nov 2012 16:34:37 +0000 (17:34 +0100)]
vc1dec: check first field slices, fix out of array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests
Diego Biurrun [Fri, 19 Oct 2012 23:12:18 +0000 (01:12 +0200)]
fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests

7 years agoppc: do not pass redundant compiler flags
Mans Rullgard [Wed, 14 Nov 2012 00:07:13 +0000 (00:07 +0000)]
ppc: do not pass redundant compiler flags

The -mpowerpc64 and -mpowerpc-gfxopt flags are implicitly set by
-mcpu as needed.  Passing them explicitly is redundant and can
conflict with user-supplied flags.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoavutil: change GET_UTF8 to not use av_log2()
Mans Rullgard [Tue, 13 Nov 2012 15:49:39 +0000 (15:49 +0000)]
avutil: change GET_UTF8 to not use av_log2()

This removes an inter-library dependency on ff_log2_tab causing
linking errors in some configurations.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agomov: Dont try to calculate with unknown durations, fix division by 0
Michael Niedermayer [Wed, 14 Nov 2012 13:07:58 +0000 (14:07 +0100)]
mov: Dont try to calculate with unknown durations, fix division by 0

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 [Wed, 14 Nov 2012 11:34:30 +0000 (12:34 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: mmx2 ---> mmxext in asm constructs

Conflicts:
libavcodec/x86/h264_chromamc_10bit.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264dsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'da39cac8def7ea73cad2fa2b611209663c7abe2c'
Michael Niedermayer [Wed, 14 Nov 2012 11:26:55 +0000 (12:26 +0100)]
Merge commit 'da39cac8def7ea73cad2fa2b611209663c7abe2c'

Not merged, its not broken

* commit 'da39cac8def7ea73cad2fa2b611209663c7abe2c':
  Drop broken and unused CABAC test program.

Conflicts:
libavcodec/Makefile
libavcodec/cabac.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRemove deprecation of avcodec_get_chroma_sub_sample.
Michael Niedermayer [Wed, 14 Nov 2012 10:59:25 +0000 (11:59 +0100)]
Remove deprecation of avcodec_get_chroma_sub_sample.

Add explanations what the difference between the 2 functions are and
when either should be used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'
Michael Niedermayer [Wed, 14 Nov 2012 10:22:40 +0000 (11:22 +0100)]
Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'

* commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2':
  x86: h264_weight_10bit: port to cpuflags
  libtheoraenc: add missing pixdesc.h header
  avcodec: remove ff_is_hwaccel_pix_fmt
  pixdesc: add av_pix_fmt_get_chroma_sub_sample
  hlsenc: stand alone hls segmenter

Conflicts:
doc/muxers.texi
libavcodec/ffv1enc.c
libavcodec/imgconvert.c
libavcodec/mpegvideo_enc.c
libavcodec/tiffenc.c
libavformat/Makefile
libavformat/allformats.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosegment: fix NULL pointer dereference in seg_write_header()
Xi Wang [Wed, 14 Nov 2012 07:52:32 +0000 (02:52 -0500)]
segment: fix NULL pointer dereference in seg_write_header()

Since the pointer `oc' is NULL, oc->oformat->name will cause a null
pointer dereference.  This patch changes it to seg->oformat->name.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoffserver: fix NULL dereference with quoted Stream name.
Clément Bœsch [Wed, 14 Nov 2012 09:03:56 +0000 (11:03 +0200)]
ffserver: fix NULL dereference with quoted Stream name.

7 years agoffserver: prefer av_asprintf over malloc+snprintf for Launch setting.
Clément Bœsch [Wed, 14 Nov 2012 08:36:23 +0000 (10:36 +0200)]
ffserver: prefer av_asprintf over malloc+snprintf for Launch setting.

7 years ago8bps: check index against buffer size before reading line length pointer.
Michael Niedermayer [Wed, 14 Nov 2012 02:33:06 +0000 (03:33 +0100)]
8bps: check index against buffer size before reading line length pointer.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg12data: increase size of ff_mpeg1_default_intra_matrix to prevent harmless overre...
Michael Niedermayer [Wed, 14 Nov 2012 02:17:13 +0000 (03:17 +0100)]
mpeg12data: increase size of ff_mpeg1_default_intra_matrix to prevent harmless overreads from crashing

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaasc: check before reading the first 4 byte, fix overread
Michael Niedermayer [Wed, 14 Nov 2012 02:03:04 +0000 (03:03 +0100)]
aasc: check before reading the first 4 byte, fix overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovmnc: check input size before reading chunk header, fix overread
Michael Niedermayer [Wed, 14 Nov 2012 01:50:59 +0000 (02:50 +0100)]
vmnc: check input size before reading chunk header, fix overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'lippit/master'
Michael Niedermayer [Wed, 14 Nov 2012 01:24:11 +0000 (02:24 +0100)]
Merge remote-tracking branch 'lippit/master'

* lippit/master:
  Update iec61883 to handle multiple devices, and allow selection of DV device by its GUID

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: fix double ;;
Michael Niedermayer [Wed, 14 Nov 2012 01:06:50 +0000 (02:06 +0100)]
ffmpeg: fix double ;;

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: fix audio timestamps on stream copy with -ss
Michael Niedermayer [Wed, 14 Nov 2012 00:42:33 +0000 (01:42 +0100)]
ffmpeg: fix audio timestamps on stream copy with -ss

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: mmx2 ---> mmxext in asm constructs
Diego Biurrun [Mon, 9 Jul 2012 22:04:18 +0000 (00:04 +0200)]
x86: mmx2 ---> mmxext in asm constructs

7 years agoDrop broken and unused CABAC test program.
Diego Biurrun [Fri, 5 Oct 2012 10:12:52 +0000 (12:12 +0200)]
Drop broken and unused CABAC test program.

7 years agoimc: sanity check scalefactors.
Michael Niedermayer [Tue, 13 Nov 2012 23:01:56 +0000 (00:01 +0100)]
imc: sanity check scalefactors.

This fixes undefined behavior

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolxfdec: fix "no audio stream" check. avoid null ptrs deref
Michael Niedermayer [Tue, 13 Nov 2012 22:03:38 +0000 (23:03 +0100)]
lxfdec: fix "no audio stream" check. avoid null ptrs deref

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/frei0r: add additional trailing slash in FREI0R_PATH paths
Stefano Sabatini [Mon, 29 Oct 2012 17:44:27 +0000 (18:44 +0100)]
lavfi/frei0r: add additional trailing slash in FREI0R_PATH paths

Allow to accept paths with no ending trailing slash.

Based on a patch by rogerdpack <rogerpack2005@gmail.com>.

7 years agolavfi/frei0r: correctly handle paths longer than 1023 chars
Stefano Sabatini [Mon, 29 Oct 2012 17:33:11 +0000 (18:33 +0100)]
lavfi/frei0r: correctly handle paths longer than 1023 chars

7 years agoav_probe_input_format3: support NULL as buffer. Fixes null ptr deref
Michael Niedermayer [Tue, 13 Nov 2012 21:20:44 +0000 (22:20 +0100)]
av_probe_input_format3: support NULL as buffer. Fixes null ptr deref

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoalac: check channel count more completely, fix out of array read
Michael Niedermayer [Tue, 13 Nov 2012 21:07:39 +0000 (22:07 +0100)]
alac: check channel count more completely, fix out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavrndec: calculate true_height only when used.
Michael Niedermayer [Tue, 13 Nov 2012 21:02:46 +0000 (22:02 +0100)]
avrndec: calculate true_height only when used.

Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopcmdec: consistently use codec_id, fixes out of array reads
Michael Niedermayer [Tue, 13 Nov 2012 20:43:37 +0000 (21:43 +0100)]
pcmdec: consistently use codec_id, fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegts: prevent freeing ones own section in pat_cb
Michael Niedermayer [Tue, 13 Nov 2012 18:48:03 +0000 (19:48 +0100)]
mpegts: prevent freeing ones own section in pat_cb

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomov: check stps correctly, avoid overreading 1 element.
Michael Niedermayer [Tue, 13 Nov 2012 18:41:55 +0000 (19:41 +0100)]
mov: check stps correctly, avoid overreading 1 element.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodvdec: check ipcm more completely, avoid assert failure.
Michael Niedermayer [Tue, 13 Nov 2012 18:37:47 +0000 (19:37 +0100)]
dvdec: check ipcm more completely, avoid assert failure.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/wtvenc: fix s[tp]_pairs memleak.
Clément Bœsch [Sun, 11 Nov 2012 22:55:25 +0000 (23:55 +0100)]
lavf/wtvenc: fix s[tp]_pairs memleak.

7 years agoUpdate iec61883 to handle multiple devices, and allow
Georg Lippitsch [Thu, 12 Jul 2012 21:36:05 +0000 (23:36 +0200)]
Update iec61883 to handle multiple devices, and allow
selection of DV device by its GUID

7 years agompeg4video_parser: init static tables before use, fix nulll ptr deref
Michael Niedermayer [Tue, 13 Nov 2012 18:21:29 +0000 (19:21 +0100)]
mpeg4video_parser: init static tables before use, fix nulll ptr deref

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg4videodec: split static decoder table init out
Michael Niedermayer [Tue, 13 Nov 2012 18:20:59 +0000 (19:20 +0100)]
mpeg4videodec: split static decoder table init out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: h264_weight_10bit: port to cpuflags
Diego Biurrun [Sun, 15 Jul 2012 13:44:39 +0000 (15:44 +0200)]
x86: h264_weight_10bit: port to cpuflags

7 years agorv10: consider B frames in low delay streams invalid.
Michael Niedermayer [Tue, 13 Nov 2012 16:59:18 +0000 (17:59 +0100)]
rv10: consider B frames in low delay streams invalid.

Fix assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibtheoraenc: add missing pixdesc.h header
Luca Barbato [Tue, 13 Nov 2012 16:42:13 +0000 (17:42 +0100)]
libtheoraenc: add missing pixdesc.h header

Was left out from c1a02e884ac785033baab356a5437adf057a4189.

7 years agodcadec: check layout & channel count for consistency.
Michael Niedermayer [Tue, 13 Nov 2012 16:33:03 +0000 (17:33 +0100)]
dcadec: check layout & channel count for consistency.

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec: remove ff_is_hwaccel_pix_fmt
Luca Barbato [Mon, 12 Nov 2012 00:25:44 +0000 (01:25 +0100)]
avcodec: remove ff_is_hwaccel_pix_fmt

It is used only in one place and is unlikely it would be needed
elsewhere.

7 years agopixdesc: add av_pix_fmt_get_chroma_sub_sample
Luca Barbato [Mon, 12 Nov 2012 00:25:43 +0000 (01:25 +0100)]
pixdesc: add av_pix_fmt_get_chroma_sub_sample

Deprecate avcodec_get_chroma_sub_sample.

7 years agompegts: dont set stream info when a decoder has already been opened.
Michael Niedermayer [Tue, 13 Nov 2012 14:43:01 +0000 (15:43 +0100)]
mpegts: dont set stream info when a decoder has already been opened.

Fixes assertion failure.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegts: prevent freeing ones own section in pmt_cb
Michael Niedermayer [Tue, 13 Nov 2012 14:21:41 +0000 (15:21 +0100)]
mpegts: prevent freeing ones own section in pmt_cb

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopaf: set channel layout
Paul B Mahol [Tue, 13 Nov 2012 13:25:19 +0000 (13:25 +0000)]
paf: set channel layout

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoReplace rest of libavutil/audioconvert.h with libavutil/channel_layout.h
Paul B Mahol [Tue, 13 Nov 2012 13:16:48 +0000 (13:16 +0000)]
Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h

Also remove it in once case when it is not needed.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavcodec.h: update audioconvert.h header after rename
Michael Niedermayer [Tue, 13 Nov 2012 12:30:52 +0000 (13:30 +0100)]
avcodec.h: update audioconvert.h header after rename

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: store and propagate number of channels information in audio buffer properties
Stefano Sabatini [Mon, 30 Jul 2012 14:00:05 +0000 (16:00 +0200)]
lavfi: store and propagate number of channels information in audio buffer properties

The channels field is required since the channel layout is not always
available.

7 years agodoc/encoders: document libtheora encoder
Stefano Sabatini [Sun, 11 Nov 2012 11:40:46 +0000 (12:40 +0100)]
doc/encoders: document libtheora encoder

7 years agolavc/libtheoraenc: return proper error codes
Stefano Sabatini [Sun, 11 Nov 2012 10:32:41 +0000 (11:32 +0100)]
lavc/libtheoraenc: return proper error codes

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 13 Nov 2012 10:09:38 +0000 (11:09 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (24 commits)
  yop: set channel layout
  wtv: set channel layout for mpeg audio
  westwood_aud: set channel layout
  wc3movie: set channel layout
  tmv: set channel layout
  tiertexseq: set channel layout
  swfdec: set channel layout
  sol: set channel layout
  smacker: set channel layout
  siff: set channel layout
  sierravmd: set channel layout
  rtpdec_amr: set channel layout
  rsodec: set channel layout
  rmdec: set channel layout for RA version 3
  qcp: set channel layout
  psxstr: set channel layout
  omadec: set channel layout
  oggparsespeex: validate channel count and set channel layout
  nuv: set channel layout
  mxg: set channel layout
  ...

Conflicts:
libavformat/swfdec.c
libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'
Michael Niedermayer [Tue, 13 Nov 2012 09:55:07 +0000 (10:55 +0100)]
Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'

* commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b': (21 commits)
  jvdec: set channel layout
  iss: set channel layout
  ipmovie: set channel layout
  iff: set channel layout
  idroqdec: set channel layout
  gxfdec: set channel layout when applicable
  gsmdec: set channel layout
  flvdec: set channel layout
  dv: set channel layout
  dsicin: set channel layout
  daud: set channel layout
  cdxl: set channel layout
  bmv: set channel layout
  bink: set channel layout
  bfi: set channel layout
  bethsoftvid: set channel layout
  apc: set channel layout
  amr: set channel_layout
  ppc: replace pointer casting with AV_COPY32
  ppc: fix some unused variable warnings
  ...

Conflicts:
libavformat/amr.c
libavformat/iff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoremove tests/asynth1.sw
Michael Niedermayer [Tue, 13 Nov 2012 09:35:18 +0000 (10:35 +0100)]
remove tests/asynth1.sw

This file appears to have been commited by 100l mistake.

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate/avfilter: honor GPL dependency.
Clément Bœsch [Tue, 13 Nov 2012 08:12:58 +0000 (10:12 +0200)]
fate/avfilter: honor GPL dependency.

7 years agohlsenc: stand alone hls segmenter
Luca Barbato [Fri, 26 Oct 2012 14:36:56 +0000 (16:36 +0200)]
hlsenc: stand alone hls segmenter

Simplifies usage but has higher latency.

7 years agowavpack: check the blocks sample count, fix out of array accesses
Michael Niedermayer [Tue, 13 Nov 2012 00:12:26 +0000 (01:12 +0100)]
wavpack: check the blocks sample count, fix out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowavpack: check ch_offset
Michael Niedermayer [Tue, 13 Nov 2012 00:05:04 +0000 (01:05 +0100)]
wavpack: check ch_offset

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoflashv: check if keyframe is available, fix null deref.
Michael Niedermayer [Mon, 12 Nov 2012 23:21:59 +0000 (00:21 +0100)]
flashv: check if keyframe is available, fix null deref.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoflashv: use avcodec_set_dimensions()
Michael Niedermayer [Mon, 12 Nov 2012 23:21:16 +0000 (00:21 +0100)]
flashv: use avcodec_set_dimensions()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosvq1dec: dont export the qscale table.
Michael Niedermayer [Mon, 12 Nov 2012 21:58:57 +0000 (22:58 +0100)]
svq1dec: dont export the qscale table.

SVQ1 has no qscales so the table is of no use, and it triggers a bug as
SVQ1 does not maintain the size of the table properly causing a crash.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoindeo4: more complete check for the scan vs block sizes.
Michael Niedermayer [Mon, 12 Nov 2012 20:50:20 +0000 (21:50 +0100)]
indeo4: more complete check for the scan vs block sizes.

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/aac: fix shared build failures with MSVC.
Clément Bœsch [Thu, 8 Nov 2012 23:09:30 +0000 (00:09 +0100)]
lavc/aac: fix shared build failures with MSVC.

This is a workaround until a better solution is found.

7 years agoxan: check size_segment before reading, fixes out of array read.
Michael Niedermayer [Mon, 12 Nov 2012 19:42:33 +0000 (20:42 +0100)]
xan: check size_segment 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 agomjpegdec: tighten unescaped_buf_size size check, prevent null ptr deref
Michael Niedermayer [Mon, 12 Nov 2012 19:27:29 +0000 (20:27 +0100)]
mjpegdec: tighten unescaped_buf_size size check, prevent null ptr deref

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswfdec: check space before copy
Michael Niedermayer [Mon, 12 Nov 2012 18:29:08 +0000 (19:29 +0100)]
swfdec: check space before copy

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotheora: check that pix fmt is valid, fix null ptr deref
Michael Niedermayer [Mon, 12 Nov 2012 17:04:12 +0000 (18:04 +0100)]
theora: check that pix fmt is valid, fix null ptr deref

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolagarith: always allocate for 4 planes. Fixes out of array accesses
Michael Niedermayer [Mon, 12 Nov 2012 16:35:01 +0000 (17:35 +0100)]
lagarith: always allocate for 4 planes. Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowv: use right function to read block_samples
Paul B Mahol [Mon, 12 Nov 2012 15:48:54 +0000 (15:48 +0000)]
wv: use right function to read block_samples

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoyop: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 22:59:00 +0000 (18:59 -0400)]
yop: set channel layout

7 years agowtv: set channel layout for mpeg audio
Justin Ruggles [Sat, 7 Apr 2012 22:55:43 +0000 (18:55 -0400)]
wtv: set channel layout for mpeg audio

7 years agowestwood_aud: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 22:50:41 +0000 (18:50 -0400)]
westwood_aud: set channel layout

7 years agowc3movie: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 22:49:09 +0000 (18:49 -0400)]
wc3movie: set channel layout

7 years agotmv: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 22:45:49 +0000 (18:45 -0400)]
tmv: set channel layout

7 years agotiertexseq: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 22:44:20 +0000 (18:44 -0400)]
tiertexseq: set channel layout

7 years agoswfdec: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 22:42:26 +0000 (18:42 -0400)]
swfdec: set channel layout

7 years agosol: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 22:38:29 +0000 (18:38 -0400)]
sol: set channel layout

7 years agosmacker: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 22:36:49 +0000 (18:36 -0400)]
smacker: set channel layout

7 years agosiff: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 22:36:08 +0000 (18:36 -0400)]
siff: set channel layout

7 years agosierravmd: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 22:32:13 +0000 (18:32 -0400)]
sierravmd: set channel layout

7 years agortpdec_amr: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 22:24:45 +0000 (18:24 -0400)]
rtpdec_amr: set channel layout

7 years agorsodec: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 22:18:37 +0000 (18:18 -0400)]
rsodec: set channel layout