ffmpeg.git
7 years agoffv1dec: print more information for -debug 1
Michael Niedermayer [Sun, 3 Jun 2012 23:00:26 +0000 (01:00 +0200)]
ffv1dec: print more information for -debug 1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 38c9ebd2a97a1298e4c5cc9d01d88d69c55be695)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1: fix log level of FF_DEBUG_PICT_INFO
Michael Niedermayer [Sun, 3 Jun 2012 22:55:02 +0000 (00:55 +0200)]
ffv1: fix log level of FF_DEBUG_PICT_INFO

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 730d079bf756c40f4a3c4624388db11d1be3475f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompc8: fix channel checks
Michael Niedermayer [Sun, 3 Jun 2012 15:40:30 +0000 (17:40 +0200)]
mpc8: fix channel checks

fix heap array overflow

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 44c10168cff41c200825448b77cb8feff0d316c9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoav_get_audio_frame_duration: fix FPE
Michael Niedermayer [Sun, 3 Jun 2012 15:12:26 +0000 (17:12 +0200)]
av_get_audio_frame_duration: fix FPE

Fixes ticket1392

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a5ad3c2382ac27cf712aaba6a222ec12f5eb88da)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomace: check channel count, fixes FPE
Michael Niedermayer [Sun, 3 Jun 2012 12:53:43 +0000 (14:53 +0200)]
mace: check channel count, fixes FPE

Fixes ticket1391

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6df1cfa7e4d488051d7b5033c0c69df970db9f82)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh263: disable loop filter with lowres
Michael Niedermayer [Sun, 3 Jun 2012 12:41:21 +0000 (14:41 +0200)]
h263: disable loop filter with lowres

Fixes ticket1212

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cc229d4e83889d1298f1a0863b55feec6c5c339a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompc7: fix handling of last frame
Michael Niedermayer [Sat, 2 Jun 2012 21:43:31 +0000 (23:43 +0200)]
mpc7: fix handling of last frame

Fixes heap buffer overflow
Fixes ticket1393

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e95233789c08f55c0b2d0657bada609629a59294)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggdec: fix regression that caused reading the whole file during open
Michael Niedermayer [Sat, 2 Jun 2012 20:50:40 +0000 (22:50 +0200)]
oggdec: fix regression that caused reading the whole file during open

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e0eaf1004910e451cbb8dbcb5c54ac63721adb61)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopng_parser: dont falsely mark frames as keyframes
Michael Niedermayer [Sat, 2 Jun 2012 19:12:20 +0000 (21:12 +0200)]
png_parser: dont falsely mark frames as keyframes

Fixes Ticket1381

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 82570d2f09e76d262f4eb57b591b08c4aa64729a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: use input keyframe flag when muxer does not provide keyframe flags.
Michael Niedermayer [Sat, 2 Jun 2012 19:11:43 +0000 (21:11 +0200)]
lavf: use input keyframe flag when muxer does not provide keyframe flags.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5665674b55a45df757ed4fcd076a5cdf9ab484b6)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobink: fix out of reference frame read
Michael Niedermayer [Sat, 2 Jun 2012 17:56:10 +0000 (19:56 +0200)]
bink: fix out of reference frame read

Fixes Ticket1374

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b3675f890abee0bc446495711223a5c790234672)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: log debug output for slightly truncated streams
Michael Niedermayer [Sat, 2 Jun 2012 13:37:20 +0000 (15:37 +0200)]
h264: log debug output for slightly truncated streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fb4e434cfb5bf5510bf9ade40a9b63e3a579247e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: try to better handle h264 streams that are slightly truncated
Michael Niedermayer [Sat, 2 Jun 2012 11:58:28 +0000 (13:58 +0200)]
h264: try to better handle h264 streams that are slightly truncated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cd0f9f00a2471891b692729d8e62c8979396a2ee)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobmv: fix apparent sign error in the frame_off check
Michael Niedermayer [Sat, 2 Jun 2012 02:06:16 +0000 (04:06 +0200)]
bmv: fix apparent sign error in the frame_off check

Fixes part of Ticket1373

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit debbcfae6010f027a0334d70d0dbb7ddd912ad5a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobmv: fix integer overflows in vlc decoder.
Michael Niedermayer [Sat, 2 Jun 2012 02:04:29 +0000 (04:04 +0200)]
bmv: fix integer overflows in vlc decoder.

Fixes part of Ticket1373

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Based-on-patch-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 679c578cb8e82df6fdee977e3137a26a680ad346)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1: fix integer overflow in quant table initialization
Michael Niedermayer [Sat, 2 Jun 2012 00:37:36 +0000 (02:37 +0200)]
ffv1: fix integer overflow in quant table initialization

Fixes part of Ticket1372

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9ebe6e391071690dbee79a645c51b14bd55c2ff4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1: fix crash caused by version becoming inconsistent
Michael Niedermayer [Sat, 2 Jun 2012 00:21:30 +0000 (02:21 +0200)]
ffv1: fix crash caused by version becoming inconsistent

Fixes part of Ticket1372

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 97c281d5b7d1c4850a8ba7d9921137634224b2f3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofraps: fix version 0/1 input data size check.
Michael Niedermayer [Fri, 1 Jun 2012 21:21:03 +0000 (23:21 +0200)]
fraps: fix version 0/1 input data size check.

Fixes array overread.
Fixes Ticket1371

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0bae6661cd171abf55cfa4b8970b08c470d65dee)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowmv1: check that the input buffer is large enough
Michael Niedermayer [Fri, 1 Jun 2012 19:42:29 +0000 (21:42 +0200)]
wmv1: check that the input buffer is large enough

Fixes null ptr deref
Fixes Ticket1367

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f23a2418fb0ccc56fdae4dbf83a5994cc917c475)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorv20: fix lowres out of array read
Michael Niedermayer [Fri, 1 Jun 2012 15:07:07 +0000 (17:07 +0200)]
rv20: fix lowres out of array read

Fixes Ticket1239

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0766b6e3ec6b7f51af5787421290284050e32a91)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoyopdec: check frame oddness to be within supported limits
Michael Niedermayer [Fri, 1 Jun 2012 13:52:20 +0000 (15:52 +0200)]
yopdec: check frame oddness to be within supported limits

Fixes Ticket1365

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit febc013dc5d6db1535a4f91cf02fa8089038937c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoyopdec: check that palette fits in the packet
Michael Niedermayer [Fri, 1 Jun 2012 13:51:50 +0000 (15:51 +0200)]
yopdec: check that palette fits in the packet

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b6fdf8dea7aaf3cb9a979dce91f752c2ce3086a3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago8svx: fix crash
Michael Niedermayer [Thu, 31 May 2012 23:33:00 +0000 (01:33 +0200)]
8svx: fix crash

Fixes Ticket1377

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 03ce421c1361e4ce79468de8269ad51ba2ae4c16)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosgienc: add a limit for maximum supported resolution
Piotr Bandurski [Thu, 31 May 2012 18:10:04 +0000 (20:10 +0200)]
sgienc: add a limit for maximum supported resolution

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 59352cc219c4f933c9a83b45043ec4810c2a51ee)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoqdm2: fix incorrect error spam
Michael Niedermayer [Thu, 31 May 2012 22:35:06 +0000 (00:35 +0200)]
qdm2: fix incorrect error spam

Fixes Ticket1375

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8a0efa9cc075523b09b4a0585389df865996c214)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmp3lame: add missing layout terminator
Michael Niedermayer [Thu, 31 May 2012 22:07:36 +0000 (00:07 +0200)]
libmp3lame: add missing layout terminator

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e47e23698b4ba4388c00379e2b2443b2cfd0aa67)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: Fail on DPC its not fully implemented
Michael Niedermayer [Thu, 31 May 2012 21:52:08 +0000 (23:52 +0200)]
h264: Fail on DPC its not fully implemented

Fixes part of Ticket1369

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7cb86633622de22c8b6e43c9d608361e5adda740)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodv-demux: dont mess with codec values
Michael Niedermayer [Thu, 31 May 2012 21:50:08 +0000 (23:50 +0200)]
dv-demux: dont mess with codec values

Fixes part of Ticket1369

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3c276ac0f8936745543d14674842647c502bdd2e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojacosub_probe: slightly increase the score to limit misdetection.
Clément Bœsch [Thu, 31 May 2012 20:12:46 +0000 (22:12 +0200)]
jacosub_probe: slightly increase the score to limit misdetection.
(cherry picked from commit 303619d3ca9efa0031f6fede7dedeb27fcfb1756)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojacosub_probe: speedup by making only one call to sscanf
Clément Bœsch [Thu, 31 May 2012 19:12:25 +0000 (21:12 +0200)]
jacosub_probe: speedup by making only one call to sscanf
(cherry picked from commit 908293d1bcaa0e059561bec8ae0b3ad1fde2d196)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: move q0 scan tables into context
Michael Niedermayer [Thu, 31 May 2012 18:19:56 +0000 (20:19 +0200)]
h264: move q0 scan tables into context

This fixes out of global array reads.
The alternative solutions of checking the index or modifying the VLC tables
to prevent the index going outside are each about 1-2 cpu cyclces slower
per coded 4x4 block.
The alternative of padding the global tables directly is more ugly and
moving them to the context should benefit cache locality.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b7d14883939e756cbda376c66552be9d843910a0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggparsevorbis: fix null ptr dereference
Michael Niedermayer [Thu, 31 May 2012 17:06:14 +0000 (19:06 +0200)]
oggparsevorbis: fix null ptr dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 18b46a494ef3592d69f4638dac1ebb613c0f548d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg4videodec: Check that cplx_estimation_* fits in the available space
Michael Niedermayer [Thu, 31 May 2012 16:54:00 +0000 (18:54 +0200)]
mpeg4videodec: Check that cplx_estimation_* fits in the available space

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b02cc2ddc610cd84bbee5923a642a8324988b28c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agogifenc: support resolutions up to 65535x65535
Piotr Bandurski [Thu, 31 May 2012 13:17:59 +0000 (15:17 +0200)]
gifenc: support resolutions up to 65535x65535

Maybe someone can add a check in the second gif encoder (rgb24), because I'm not sure where it should be added.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e03ddbcd919b11a289c2de8a47c83efe7fab32fb)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoipmovie_probe: speedup by avoiding memcmp() call
Michael Niedermayer [Thu, 31 May 2012 14:19:26 +0000 (16:19 +0200)]
ipmovie_probe: speedup by avoiding memcmp() call

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cc4d80c99ff3169b71c62691d5c7602ef673c3dc)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoac3_probe: speedup by checking for header earlier
Michael Niedermayer [Thu, 31 May 2012 14:14:27 +0000 (16:14 +0200)]
ac3_probe: speedup by checking for header earlier

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ebfe0c6eb800222955d480b943b646e7a6ee2a1c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobinkaudio: check number of channels
Paul B Mahol [Thu, 31 May 2012 08:58:31 +0000 (08:58 +0000)]
binkaudio: check number of channels

Fixes #1380.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit 824a6975ee066e944b7a20d1e220fd8974fb6174)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoindeo5: check quant_mat
Michael Niedermayer [Thu, 31 May 2012 03:01:28 +0000 (05:01 +0200)]
indeo5: check quant_mat

prevents out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8aaa00c3012d425ce50efffadb813ad62d1ff3d5)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1: fix reading global header with CRC
Michael Niedermayer [Wed, 30 May 2012 22:47:36 +0000 (00:47 +0200)]
ffv1: fix reading global header with CRC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 21fdf1ccf0a17410943454a48764ee2b05d4b1ac)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavidec: fix odd extradata size case.
Michael Niedermayer [Wed, 30 May 2012 22:46:47 +0000 (00:46 +0200)]
avidec: fix odd extradata size case.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 57778f61d0ae2059ed95567f8e5b568fa817d33e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavformat: ff_get_bmp_header: return esize too
Michael Niedermayer [Wed, 30 May 2012 22:46:02 +0000 (00:46 +0200)]
libavformat: ff_get_bmp_header: return esize too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 76853a3e0ce4d4ef09ffcca7307991b8db832cd4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264_cavlc: check prefix before using it.
Michael Niedermayer [Wed, 30 May 2012 14:42:01 +0000 (16:42 +0200)]
h264_cavlc: check prefix before using it.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 39f0a45a1a087e5bbef84fa3366942384ec32155)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: increase scantable sizes to avoid overread
Michael Niedermayer [Wed, 30 May 2012 14:40:33 +0000 (16:40 +0200)]
h264: increase scantable sizes to avoid overread

We could also check the index but this would slow speed critical code
down.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 32e60b6bfed709a7d84fd35942baee12a6080595)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotruemotion1: Check index, fix out of array read
Michael Niedermayer [Wed, 30 May 2012 14:19:36 +0000 (16:19 +0200)]
truemotion1: Check index, fix out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fd4c1c0b70b5a06dd572d7e27799a2f4c3d9b984)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoexr: make message about missing feature more useful
Paul B Mahol [Wed, 30 May 2012 12:07:41 +0000 (12:07 +0000)]
exr: make message about missing feature more useful

Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit f5af8d5e76a5726cbeba905363293c4ac5750c8d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoiff: check if there is extradata
Paul B Mahol [Wed, 30 May 2012 07:50:32 +0000 (07:50 +0000)]
iff: check if there is extradata

Fixes #1368.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit 8f61526978697e51d3b9e61ea84daf13c42717af)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoexr: alpha support
Paul B Mahol [Tue, 29 May 2012 10:37:01 +0000 (10:37 +0000)]
exr: alpha support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit d66b0cd5c55c66964df6225ebbc8eb7cd3cc91ad)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: clarify experimental codec message
Lou Logan [Wed, 30 May 2012 01:43:23 +0000 (17:43 -0800)]
lavc: clarify experimental codec message

Should be easier for new users to get a working output.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 73f3f6baffa5386552dbe9a94d56f36286bc26f6)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoape: Fix null ptr dereference with files missing a seekatable.
Michael Niedermayer [Tue, 29 May 2012 17:50:15 +0000 (19:50 +0200)]
ape: Fix null ptr dereference with files missing a seekatable.

Such files are currently not supported as the table is used at several points

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e7cb161515fc9fb6d30d1681d64d9ba7ad737a4e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomovdec: Check count of stts/ctts elements instead of just the pointer.
Michael Niedermayer [Tue, 29 May 2012 17:28:09 +0000 (19:28 +0200)]
movdec: Check count of stts/ctts elements instead of just the pointer.

Fixes overreading the array

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5880d788734d9c4e2dc53c6cdec343ee978d3a3f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago4xm: fix division by zero caused by bps<8
Michael Niedermayer [Tue, 29 May 2012 17:16:22 +0000 (19:16 +0200)]
4xm: fix division by zero caused by bps<8

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1b8741a6843f3f4667c81c2d63d3182858aa534f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: use getter/setter functions for AVFrame.pkt_pos
Michael Niedermayer [Mon, 28 May 2012 21:43:51 +0000 (23:43 +0200)]
lavfi: use getter/setter functions for AVFrame.pkt_pos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 59a78290b6fee4b52a28a43440dff6880d3102c2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: Fill linesize, sample_rate and channel_layout fields in avfilter_fill_frame_fr...
Robert Nagy [Mon, 28 May 2012 19:45:36 +0000 (21:45 +0200)]
lavfi: Fill linesize, sample_rate and channel_layout fields in avfilter_fill_frame_from_audio_buffer_ref.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c2eae4bae7f5799c0f3cafb0cb189c420782f06c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: fix the wording for gpl incompatible licenses warnings
Michael Niedermayer [Mon, 28 May 2012 13:44:11 +0000 (15:44 +0200)]
configure: fix the wording for gpl incompatible licenses warnings

calling the 4 clause BSD license non free is quite a stretch ;)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d5a17d7f4d03d174c0cc6111fed07ebded0ac6f3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: openssl is compatible with the LGPL.
Michael Niedermayer [Mon, 28 May 2012 13:36:35 +0000 (15:36 +0200)]
configure: openssl is compatible with the LGPL.

looking at the license i cannot see why they would be incompatible and
researching this matter a bit also turned up no reasons.

If i missed something, please dont hesitate to flame me and or revert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f997ac1c8bc2124c4c6bf33ad17bc6f6cca0f84e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: disable avresample by default
Michael Niedermayer [Mon, 28 May 2012 17:43:57 +0000 (19:43 +0200)]
configure: disable avresample by default

avresample is redundant and unneeded

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f2bc2e89548706beee056f40036fc571ea817b80)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: add asyncts->avresample dependancy
Michael Niedermayer [Mon, 28 May 2012 17:43:34 +0000 (19:43 +0200)]
configure: add asyncts->avresample  dependancy
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f0e39889ad4f418655e0b1bd89dade0d7143a9e3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix r10k codec for widths that are not multiples of 64.
Carl Eugen Hoyos [Mon, 28 May 2012 17:05:15 +0000 (19:05 +0200)]
Fix r10k codec for widths that are not multiples of 64.

Fixes ticket #1358
(cherry picked from commit 5cd947d81b3b6dcfbb1f42e800270a4da5dbbcac)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMark avui encoder experimental.
Carl Eugen Hoyos [Mon, 28 May 2012 16:20:39 +0000 (18:20 +0200)]
Mark avui encoder experimental.

Some decoders require the AVID atom that we currently
do not write when encoding avui.
(cherry picked from commit 77cea13f0521d4c481ab163220017404c1a13f19)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojvdec: check videosize
Michael Niedermayer [Mon, 28 May 2012 15:21:29 +0000 (17:21 +0200)]
jvdec: check videosize

Fixes null ptr dereference
fixes Ticket1364

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b4904e804d3b1c56ac4f5d3386b15daae98fca2d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomotionpixels: check extradata size
Michael Niedermayer [Mon, 28 May 2012 15:17:49 +0000 (17:17 +0200)]
motionpixels: check extradata size

Fixes null ptr derefernce
Fixes Ticket1363

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 50122084a6b3be06781a2b3d8ec036f2d67c32e3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoiff_ilbm: fix null ptr deref
Michael Niedermayer [Mon, 28 May 2012 15:13:10 +0000 (17:13 +0200)]
iff_ilbm: fix null ptr deref

Fixes Ticket1362

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 849d4b041351ef8d77c4231cf417f997e79f9ab7)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoyop: check for missing extradata
Michael Niedermayer [Mon, 28 May 2012 15:08:06 +0000 (17:08 +0200)]
yop: check for missing extradata

Fixes null ptr deref
Fixes Ticket1361

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 77a4c8b959fa9bc6bcaa42b40a0b046cdf3fec38)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoxan: fix out of array read
Michael Niedermayer [Mon, 28 May 2012 15:04:38 +0000 (17:04 +0200)]
xan: fix out of array read

Fixes ticket1360

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 01900fcc45e99ee4556e0a5d87ff57b2f150dad4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocdgraphics: Fix out of array write
Michael Niedermayer [Mon, 28 May 2012 14:50:15 +0000 (16:50 +0200)]
cdgraphics: Fix out of array write

Fixes Ticket1359

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1e5c7376c4ed733910845c9a09e272ac7696b1f4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoTest extradata size before reading from extradata when decoding avui.
Carl Eugen Hoyos [Mon, 28 May 2012 13:58:46 +0000 (15:58 +0200)]
Test extradata size before reading from extradata when decoding avui.
(cherry picked from commit 83de4f5fc92b1424c7d77f3411572a9a00eff672)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavienc: create xsub in avi files that are closer to whats in the wild
Michael Niedermayer [Sun, 27 May 2012 20:45:52 +0000 (22:45 +0200)]
avienc: create xsub in avi files that are closer to whats in the wild

Fixes ticket1332

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 875851294f7dc3ce5945c6d43b76c5dd1e0ec03d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoChangelog: fix wrong/inaccurate entries.
Clément Bœsch [Sun, 27 May 2012 13:28:15 +0000 (15:28 +0200)]
Changelog: fix wrong/inaccurate entries.

(cherry picked from commit 80bf2b6e841e51ed1cb073dc0e460749ac19284f)

Conflicts:

Changelog

7 years agolavfi/deshake: add libavcodec dependency (dsputil).
Clément Bœsch [Sat, 26 May 2012 22:34:09 +0000 (00:34 +0200)]
lavfi/deshake: add libavcodec dependency (dsputil).
(cherry picked from commit 5c3f79198c016980b8bd5e876761eb42341c3cec)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: flush codec buffers before freeing filters
Marton Balint [Thu, 24 May 2012 21:22:59 +0000 (23:22 +0200)]
ffplay: flush codec buffers before freeing filters

We do this to ensure that input_get_buffer is not called from a
frame_worker_thread of a multithreaded decoder when we already freed the
filters.

Fixes occasional segfaults on video stream change.

Signed-off-by: Marton Balint <cus@passwd.hu>
(cherry picked from commit c2e8691c07ca52de7b6b00ba8f2b30c56fd786d7)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: fix stream cycling if audio decoding fails
Marton Balint [Mon, 21 May 2012 21:33:41 +0000 (23:33 +0200)]
ffplay: fix stream cycling if audio decoding fails

Fixes ticket 1161.

Signed-off-by: Marton Balint <cus@passwd.hu>
(cherry picked from commit 8c9971c35ee8fd01978a592f8f364755494f9a9a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: force exit when filter configuration fails
Marton Balint [Mon, 21 May 2012 22:10:03 +0000 (00:10 +0200)]
ffplay: force exit when filter configuration fails

Switching to visualization instead of exiting ffplay is a bit more tricky, so
just exit for now.

Fixes ticket 38.

Signed-off-by: Marton Balint <cus@passwd.hu>
(cherry picked from commit 7315e40a24e85e7f141db77951a4b14375fde55a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: dont destroy packet queues on stream change
Marton Balint [Wed, 23 May 2012 23:56:28 +0000 (01:56 +0200)]
ffplay: dont destroy packet queues on stream change

This fixes occasional segfaults caused by lock request of the packet queue from
the reader thread.

Also don't allow to put frames into the queue when it's aborted, and don't try
to fill the queue with frames when it is aborted.

Signed-off-by: Marton Balint <cus@passwd.hu>
(cherry picked from commit a687acbbf0869def24f516b0147e9ff93695c347)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix tests without fate samples.
Alexis Ballier [Sat, 26 May 2012 18:06:12 +0000 (14:06 -0400)]
Fix tests without fate samples.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0bf90ceb84a0e09cde5a020cd46ed45558b2be58)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaf_aresample: fix pts, they where off by a packet in the -async >0 case.
Michael Niedermayer [Sat, 26 May 2012 14:17:47 +0000 (16:17 +0200)]
af_aresample: fix pts, they where off by a packet in the -async >0 case.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit be97675e6cf686900ea4ff39251cec94cfe4109c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoChangelog, spell out the CVEs that where fixed.
Michael Niedermayer [Sat, 26 May 2012 01:08:44 +0000 (03:08 +0200)]
Changelog, spell out the CVEs that where fixed.

there are some holes in the list as some things have been fixed
in previous releases already.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit aeb2dea80256379e38cdd5f5e86ae70de8ef5346)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: fix swr_drop_output()
Michael Niedermayer [Sat, 26 May 2012 00:33:38 +0000 (02:33 +0200)]
swr: fix swr_drop_output()

Fixes part of Ticket1341

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 72261fa8675ca6e118efe202fcb13fd0866d4a54)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaf_aresample: fix request_frame()
Michael Niedermayer [Sat, 26 May 2012 00:28:40 +0000 (02:28 +0200)]
af_aresample: fix request_frame()

Fixes part of Ticket1341

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 411689b5e1189e325f12060e52e7c5cb29f87b21)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoUpdate for 0.11 n0.11
Michael Niedermayer [Fri, 25 May 2012 16:20:00 +0000 (18:20 +0200)]
Update for 0.11

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavfilter: export ff_default_query_formats()
Michael Niedermayer [Fri, 25 May 2012 16:54:01 +0000 (18:54 +0200)]
libavfilter: export ff_default_query_formats()

Its needed for fate on shared versioned .so

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorelease_notes: update
Michael Niedermayer [Fri, 25 May 2012 15:27:40 +0000 (17:27 +0200)]
release_notes: update

Note, if you want something mentioned in the release notes for 0.11
push it but be real quick ...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRevert "removing lowres support"
Michael Niedermayer [Fri, 25 May 2012 10:35:42 +0000 (12:35 +0200)]
Revert "removing lowres support"

There have been multiple user complaints about loosing this feature
while its not clear the 3% speedloss claims where real or fabricated.
My own testing indicates no statistically significant speed difference
both with mpeg2 and mpeg4, and if at all the code with lowres support
is a tiny bit faster than without.

This reverts commit 92ef4be4ab9fbb7d901b22e0036a4ca90b00a476, reversing
changes made to 2e07f42957666df6d7c63a62263b8447e97b1442.

Conflicts:

cmdutils.c
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavutil/arm/Makefile

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavdevice: bump soname due to lavf soname bump
Michael Niedermayer [Fri, 25 May 2012 10:22:21 +0000 (12:22 +0200)]
avdevice: bump soname due to lavf soname bump

avdevice is just a part of lavf and uses lavf API/ABI/structures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/pixdesctest: use AVPALETTE_SIZE macro
Stefano Sabatini [Fri, 25 May 2012 09:16:40 +0000 (11:16 +0200)]
lavfi/pixdesctest: use AVPALETTE_SIZE macro

7 years agolavfi/pixdesctest: fix SAME -> SAME memcpy
Stefano Sabatini [Fri, 25 May 2012 01:03:38 +0000 (03:03 +0200)]
lavfi/pixdesctest: fix SAME -> SAME memcpy

Fix pixdesctest output with pal8 input.

X-Cola-Count: +(10+i*PI)l

7 years agolavfi/hflip: copy palette data in start_frame()
Stefano Sabatini [Sat, 7 Apr 2012 07:57:07 +0000 (09:57 +0200)]
lavfi/hflip: copy palette data in start_frame()

Fix trac ticket #1116.

7 years agolavfi/aresample: print channel layouts and formats along with the rate.
Clément Bœsch [Thu, 24 May 2012 22:07:40 +0000 (00:07 +0200)]
lavfi/aresample: print channel layouts and formats along with the rate.

7 years agoFixed warnings about int64 to int32 conversion
Michael Bradshaw [Wed, 16 May 2012 17:39:20 +0000 (11:39 -0600)]
Fixed warnings about int64 to int32 conversion

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 24 May 2012 22:38:16 +0000 (00:38 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: Return a proper error code instead of -1
  rtmp: Check malloc calls
  rtmp: Check ff_rtmp_packet_create calls
  lavfi: add audio mix filter
  flvdec: Make sure sample_rate is set to the updated value
  tqi: Pass errors from the MB decoder

Conflicts:
Changelog
doc/filters.texi
libavcodec/eatqi.c
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: move "aformat" before "amerge".
Clément Bœsch [Thu, 24 May 2012 21:55:17 +0000 (23:55 +0200)]
doc/filters: move "aformat" before "amerge".

7 years agodoc/filters: remove old aformat entry.
Clément Bœsch [Thu, 24 May 2012 21:54:04 +0000 (23:54 +0200)]
doc/filters: remove old aformat entry.

The new description is still available below.

7 years agolavfi/video: add avfilter.h include to fix make checkheaders.
Clément Bœsch [Thu, 24 May 2012 21:46:15 +0000 (23:46 +0200)]
lavfi/video: add avfilter.h include to fix make checkheaders.

7 years agoffmpeg: use AUTO_INSERT_FILTER() for -async option.
Clément Bœsch [Sat, 19 May 2012 18:08:25 +0000 (20:08 +0200)]
ffmpeg: use AUTO_INSERT_FILTER() for -async option.

7 years agoChangelog: update for 0.11
Michael Niedermayer [Thu, 24 May 2012 19:27:01 +0000 (21:27 +0200)]
Changelog: update for 0.11

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMAINTAINERS: update versions
Michael Niedermayer [Thu, 24 May 2012 19:15:01 +0000 (21:15 +0200)]
MAINTAINERS: update versions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: remove ffmpeg-mt-authorship.txt from master (for upcoming 0.11)
Michael Niedermayer [Thu, 24 May 2012 19:07:14 +0000 (21:07 +0200)]
doc: remove ffmpeg-mt-authorship.txt from master (for upcoming 0.11)

This lists git history, which is better kept in the history itself
that is both ours as this file as well as the actual history of the
ffmpeg-mt project.
If someone thinks this is not ok, drop me a mail and ill put it back!

Also note this file was not carried in our previous release with noone
complaining

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: set base in dr1 allocation.
Michael Niedermayer [Thu, 24 May 2012 16:40:49 +0000 (18:40 +0200)]
ffplay: set base in dr1 allocation.

This matches the default non dr1 allocator

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodshow: rename dshow.h to avoid conflict with system header of equal name
Kyle [Thu, 24 May 2012 11:59:33 +0000 (13:59 +0200)]
dshow: rename dshow.h to avoid conflict with system header of equal name

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: update checksum after pal8 changes
Michael Niedermayer [Thu, 24 May 2012 12:11:50 +0000 (14:11 +0200)]
fate: update checksum after pal8 changes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoBuild the aformat filter when ffmpeg is built.
Carl Eugen Hoyos [Thu, 24 May 2012 10:26:31 +0000 (12:26 +0200)]
Build the aformat filter when ffmpeg is built.