ffmpeg.git
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 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 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 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 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 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

7 years agormdec: set channel layout for RA version 3
Justin Ruggles [Sat, 7 Apr 2012 22:01:27 +0000 (18:01 -0400)]
rmdec: set channel layout for RA version 3

7 years agoqcp: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 21:57:25 +0000 (17:57 -0400)]
qcp: set channel layout

7 years agopsxstr: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 21:56:19 +0000 (17:56 -0400)]
psxstr: set channel layout

7 years agoomadec: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 21:53:39 +0000 (17:53 -0400)]
omadec: set channel layout

7 years agojvdec: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 20:47:15 +0000 (16:47 -0400)]
jvdec: set channel layout

7 years agooggparsespeex: validate channel count and set channel layout
Justin Ruggles [Sat, 7 Apr 2012 21:39:30 +0000 (17:39 -0400)]
oggparsespeex: validate channel count and set channel layout

7 years agoiss: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 20:45:48 +0000 (16:45 -0400)]
iss: set channel layout

7 years agonuv: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 21:35:20 +0000 (17:35 -0400)]
nuv: set channel layout

7 years agomxg: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 21:22:05 +0000 (17:22 -0400)]
mxg: set channel layout

7 years agomvi: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 21:17:19 +0000 (17:17 -0400)]
mvi: set channel layout

7 years agompc7: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 21:03:19 +0000 (17:03 -0400)]
mpc7: set channel layout

7 years agommf: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 20:56:48 +0000 (16:56 -0400)]
mmf: set channel layout

7 years agomm: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 20:52:57 +0000 (16:52 -0400)]
mm: set channel layout

7 years agoipmovie: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 20:44:46 +0000 (16:44 -0400)]
ipmovie: set channel layout

7 years agoiff: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 18:05:45 +0000 (14:05 -0400)]
iff: set channel layout

7 years agoidroqdec: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 18:03:43 +0000 (14:03 -0400)]
idroqdec: set channel layout

7 years agogxfdec: set channel layout when applicable
Justin Ruggles [Sat, 7 Apr 2012 18:00:04 +0000 (14:00 -0400)]
gxfdec: set channel layout when applicable

7 years agogsmdec: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 17:51:42 +0000 (13:51 -0400)]
gsmdec: set channel layout

7 years agoflvdec: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 17:31:40 +0000 (13:31 -0400)]
flvdec: set channel layout

7 years agodv: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 16:59:32 +0000 (12:59 -0400)]
dv: set channel layout

7 years agodsicin: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 16:56:51 +0000 (12:56 -0400)]
dsicin: set channel layout

7 years agodaud: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 16:55:12 +0000 (12:55 -0400)]
daud: set channel layout

Update FATE reference due to WAVE channel mask now being set correctly.

7 years agocdxl: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 16:49:11 +0000 (12:49 -0400)]
cdxl: set channel layout

7 years agobmv: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 16:12:35 +0000 (12:12 -0400)]
bmv: set channel layout

7 years agobink: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 16:10:46 +0000 (12:10 -0400)]
bink: set channel layout

7 years agobfi: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 16:06:41 +0000 (12:06 -0400)]
bfi: set channel layout

7 years agobethsoftvid: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 16:05:36 +0000 (12:05 -0400)]
bethsoftvid: set channel layout

7 years agoapc: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 15:25:52 +0000 (11:25 -0400)]
apc: set channel layout

7 years agoamr: set channel_layout
Justin Ruggles [Sat, 7 Apr 2012 15:07:16 +0000 (11:07 -0400)]
amr: set channel_layout

7 years ago4xmdec: test version for cfrms, fix out of array accesses
Michael Niedermayer [Mon, 12 Nov 2012 13:56:07 +0000 (14:56 +0100)]
4xmdec: test version for cfrms, fix out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowavpack: fix out of array access
Michael Niedermayer [Mon, 12 Nov 2012 13:42:45 +0000 (14:42 +0100)]
wavpack: fix out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoadpcm: reindent after previous commit
Paul B Mahol [Wed, 7 Nov 2012 18:07:39 +0000 (18:07 +0000)]
adpcm: reindent after previous commit

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoadpcm: ADPCM IMA SMJPEG stereo decoding
Paul B Mahol [Wed, 7 Nov 2012 16:55:26 +0000 (16:55 +0000)]
adpcm: ADPCM IMA SMJPEG stereo decoding

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoanm: return meaningful error codes
Paul B Mahol [Sun, 11 Nov 2012 11:00:11 +0000 (11:00 +0000)]
anm: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 12 Nov 2012 11:18:53 +0000 (12:18 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  binkaudio: set channel layout

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '2b479bcab0a8365a7c094c5fa44b8cb6da9810d0'
Michael Niedermayer [Mon, 12 Nov 2012 11:04:31 +0000 (12:04 +0100)]
Merge commit '2b479bcab0a8365a7c094c5fa44b8cb6da9810d0'

These patches have not been merged at the request of Carl

* commit '2b479bcab0a8365a7c094c5fa44b8cb6da9810d0':
  build: Drop AVX assembly ifdefs
  x86: Require an assembler able to cope with AVX instructions

Conflicts:
libavcodec/x86/fft.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'
Michael Niedermayer [Mon, 12 Nov 2012 10:32:11 +0000 (11:32 +0100)]
Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
  doc: git-howto: Leave reviewers time to react before pushing patches
  Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
  lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h

Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/git-howto.texi
ffmpeg_filter.c
libavcodec/flacdec.c
libavcodec/imc.c
libavcodec/mpegaudiodec.c
libavcodec/utils.c
libavfilter/asrc_anullsrc.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffer.c
libavutil/Makefile
libavutil/audioconvert.h
libavutil/channel_layout.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoppc: replace pointer casting with AV_COPY32
Mans Rullgard [Sat, 10 Nov 2012 13:21:52 +0000 (13:21 +0000)]
ppc: replace pointer casting with AV_COPY32

This removes warnings about strict aliasing violations.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoppc: fix some unused variable warnings
Mans Rullgard [Sat, 10 Nov 2012 13:16:29 +0000 (13:16 +0000)]
ppc: fix some unused variable warnings

The third argument of OP_U8_ALTIVEC is evaluated at most once so
there is no need for a potentially unused temporary variable.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoconfigure: remove support for -n flag in print_enabled()
Mans Rullgard [Sat, 27 Oct 2012 18:11:04 +0000 (19:11 +0100)]
configure: remove support for -n flag in print_enabled()

This flag is no longer used.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoMerge commit '802713c4e7b41bc2deed754d78649945c3442063'
Michael Niedermayer [Mon, 12 Nov 2012 09:57:06 +0000 (10:57 +0100)]
Merge commit '802713c4e7b41bc2deed754d78649945c3442063'

* commit '802713c4e7b41bc2deed754d78649945c3442063':
  mss2: prevent potential uninitialized reads
  mss2: reindent after last commit
  mss2: fix handling of unmasked implicit WMV9 rectangles
  configure: add lavu dependency to lavr/lavfi .pc files
  x86inc: Set program_name outside of x86inc.asm

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobinkaudio: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 16:10:59 +0000 (12:10 -0400)]
binkaudio: set channel layout

7 years agovc1dec: prevent null ptr dereferences.
Michael Niedermayer [Mon, 12 Nov 2012 00:39:13 +0000 (01:39 +0100)]
vc1dec: prevent null ptr dereferences.

The added checks are in line with existing checks but should
probably be replaced by more advanced error concealment at some
point.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovc1dec: factorize srcU/V offseting out
Michael Niedermayer [Mon, 12 Nov 2012 00:34:44 +0000 (01:34 +0100)]
vc1dec: factorize srcU/V offseting out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovc1: check image height, fix division by 0
Michael Niedermayer [Mon, 12 Nov 2012 00:22:31 +0000 (01:22 +0100)]
vc1: check image height, fix division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg12: clean current picture ptr.
Michael Niedermayer [Sun, 11 Nov 2012 22:24:54 +0000 (23:24 +0100)]
mpeg12: clean current picture ptr.

This avoids having a stray pointer left that may not represent the current picture
and state.

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