Commit Graph

54995 Commits

Author SHA1 Message Date
Matthieu Bouron
01838c5732 MAINTAINERS: add myself as maintainer for lavf/aiff* and lavf/movenc.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 88a1ff2233)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-10 23:58:48 +02:00
Michael Niedermayer
f09f33031b MAINTAINERS: alphabetical sort
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 81f4d55c36)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-10 23:58:48 +02:00
Michael Niedermayer
b2a9f64e1b MAINTAINERS: Add some maintainers for parts of libavutil
Developers added are active and in the copyright of the specified files,

If anyone wants to maintain anything else, send a patch that adds you to
MAINTAINERS.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-10 23:58:48 +02:00
Michael Niedermayer
15ea618ef6 MAINTAINERS: order libavutil entries alphabetically
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 48188a5120)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-10 23:58:48 +02:00
Michael Niedermayer
ec33423273 MAINTAINERS: drop 1.1 from the releases that i maintain
There seems to be no need to continue maintaining it, people can easily
upgrade to 1.2

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-10 23:58:48 +02:00
Michael Niedermayer
d5dd54df69 MAINTAINERS: add myself as maintainer for the interface code to swresample & swscale in libavfilter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5ad4e29337)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-10 23:58:48 +02:00
Stephen Hutchinson
e7a4c34e7c avisynth: Exit gracefully when trying to serve video from v2.5.8.
'Fixes' ticket #2526 insofar as it stops 2.5.8 from crashing and
tells the user to upgrade to 2.6 if they want to make video input
work. A real solution to #2526 would be to get video input from
2.5.8 to work right.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-10 21:45:11 +02:00
Stephen Hutchinson
2881bfbfd6 avisynth: Cosmetics
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f277d6bf42)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-10 21:45:03 +02:00
Paul B Mahol
80fb38153e sgidec: safer check for buffer overflow
Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit 86e722ab97)

Conflicts:

	libavcodec/sgidec.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-10 02:03:37 +02:00
Paul B Mahol
b79f337f8a ttaenc: fix packet size
Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit bc2187cfdb)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-10 02:01:40 +02:00
Michael Niedermayer
f593ac1c21 matroskaenc: simplify mkv_check_tag()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 066111bf19)
2013-08-09 16:28:39 -03:00
James Almer
baf92305a6 lavf/matroskaenc: Check for valid metadata before creating tags
Tags must have at least one SimpleTag element to be spec conformant.
Updated lavf-mkv and seek-lavf-mkv FATE references as the tests were affected by
this.

Fixes ticket #2785

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 088ed53146)
2013-08-09 16:28:31 -03:00
Michael Niedermayer
d6d168e87b avfilter/vf_separatefields: fix ;;
Found-by: llogan
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 74561680cd)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-09 13:58:45 +02:00
Michael Niedermayer
50f9c4acc3 avformat/paf: Fix integer overflow and out of array read
Found-by:  Laurent Butti <laurentb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f58cd2867a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-09 13:53:27 +02:00
Michael Niedermayer
211374e52a avutil/mem: Fix flipped condition
Fixes return code and later null pointer dereference

Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c94f9e8542)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-09 13:53:25 +02:00
Michael Niedermayer
1bf2461765 avfilter: fix plane validity checks
Fixes out of array accesses

(cherry picked from commit e43a0a232d)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-09 13:53:14 +02:00
Michael Niedermayer
64444cd578 avcodec/kmvc: fix MV checks
Fixes Ticket2813
Fixes regression since 70b5583

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3cd8aaa2b2)
2013-07-31 02:54:26 +02:00
Paul B Mahol
0047a31090 Revert "pnm: remove nonsense code"
Breaks decoding pgms with 255 < maxval < 65535.

Found-by: Carl Eugen Hoyos <cehoyos@ag.or.at>.

This reverts commit a0348d0966.
(cherry picked from commit 768e40b451)
2013-07-29 00:05:01 +02:00
Michael Niedermayer
d73ce6cb56 jpeg2000dec: Support non subsampled 9-16bit planar pixel formats
This applies changes similar to fc6de70c44
to the >8bit codepath

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1434df3b93)
2013-07-28 04:09:21 +02:00
Michael Niedermayer
9a6d3eee59 jpeg2000dec: silence unused variable warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit db33010483)
2013-07-28 04:09:11 +02:00
Michael Niedermayer
8b221d60fa jpeg2000dec: Support non subsampled 8bit planar pixel formats
Fixes file2.jp2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fc6de70c44)
2013-07-28 04:08:10 +02:00
Michael Niedermayer
9da9b36435 jpeg2000dec: parse CDEF
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Conflicts:

	libavcodec/jpeg2000dec.c

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 99de97cabf)
2013-07-28 04:07:36 +02:00
Carl Eugen Hoyos
09b33f9a82 Fix pix_fmt detection in the native jpeg2000 decoder.
Based on b7a928b by Michael Bradshaw.
Fixes ticket #2683.

Reviewed-by: Nicolas Bertrand
(cherry picked from commit b39a6bbe7f)
2013-07-28 04:07:20 +02:00
Michael Niedermayer
fa6b6dad3d jpeg2000: fix overflow in dequantization
Fixes decoding of file generated with:
ffmpeg -f lavfi -i smptehdbars=hd720 -pix_fmt rgb48 /tmp/o.jp2

Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f57119b8e5)
2013-07-28 04:07:10 +02:00
Nicolas Bertrand
e0d88cfd18 jpeg2000: Initialize only once mqc arrays
Increases encoding and decoding speed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit dd1382ac95)
2013-07-28 04:07:02 +02:00
Michael Niedermayer
18043e3d22 avformat/dtsdec: Improve probe, reject things looking like analoge signals
Fixes Ticket2810

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6663205338)
2013-07-26 12:18:46 +02:00
Rémi Denis-Courmont
ccf470fdb6 mpeg12: Ignore slice threading if hwaccel is active
Slice threading does not work with hardware acceleration, as decoding
is per-picture.  This fixes Bugzilla #542.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit 93a51984a2)

Conflicts:
	libavcodec/mpeg12dec.c
2013-07-26 11:35:36 +02:00
Michael Niedermayer
8f9bc6f2ce swscale/input: fix 16bit gbrp input
Fixes Ticket2793

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a4b55bbb6f)
2013-07-19 14:50:16 +02:00
Lukasz Marek
fcab45f39b ftp: fix interrupt callback misuse
FTP protocol used interrupt callback to simulate nonblock
operation which is a misuse of this callback.

This commit make FTP protocol fully blocking and removes
invalid usage of interrutp callback

Also adds support for multiline responses delimited with dashes
(cherry picked from commit 247e658784)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-18 01:54:24 +02:00
Michael Niedermayer
bc44d06c3d avformat/matroskadec: Detect conflicting sample rate/default_duration
Fixes Ticket2508

Thanks-to: Moritz Bunkus
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6158a3bcdf)
2013-07-16 11:43:21 +02:00
Michael Niedermayer
7740e36a89 mjpegdec: Fix used quant index for gbr
Fixes Ticket1651

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 12:06:57 +02:00
Michael Niedermayer
6127f792f9 mjpegdec: initialize source variables before gbr remap
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 94e86ae15a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 12:06:57 +02:00
Carl Eugen Hoyos
fd2cf9c45d Suggest recompilation with openssl or gnutls if the https protocol is not found.
Fixes ticket #2765.
(cherry picked from commit 1db88c33f2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 12:06:57 +02:00
Carl Eugen Hoyos
fc3dec8b62 lavf/utils.c: Avoid a null pointer dereference on oom after duration_error allocation.
(cherry picked from commit c9eb5c9751)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 12:06:56 +02:00
Luca Barbato
a7315116dd wmavoice: conceal clearly corrupted blocks
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit d14a26edb7)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 12:06:56 +02:00
Michael Niedermayer
37268dcc86 avcodec/qdm2: initialize sign_bits
Fixes non deterministic output

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 12:03:30 +02:00
Michael Niedermayer
ea28e74205 avcodec/qdm2: store bits in an integer instead of float variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fbe159e850)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 12:02:56 +02:00
Piotr Bandurski
c1c84f0a55 avformat/utils: avformat_find_stream_info set value for ret in case of oom
without it FFmpeg didn't display any error message when oom event occured

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 12:02:33 +02:00
Paul B Mahol
56bf38859b lavfi/aconvert: unbreak
Even if its deprecated, it should still work correctly.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 12:02:00 +02:00
Piotr Bandurski
1cda4aa1e0 avformat/utils: avformat_find_stream_info fix a crash in case of oom
fixes ticket #2767

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 12:00:39 +02:00
Michael Niedermayer
9711b52739 avfilter/af_earwax: Fix out of array accesses on odd packets
Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0a3a0edd52)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 19:07:50 +02:00
Michael Niedermayer
2b8b2ba19f Changelog: replace next by 2.0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
n2.0
2013-07-10 02:47:10 +02:00
Michael Niedermayer
1ebb95d5f1 Update for 2.0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 02:15:43 +02:00
Luca Barbato
5eaed6d336 atrac3: fix error handling
decode_tonal_components returns a proper AVERROR.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 02:15:43 +02:00
Eugene Dzhurinsky
09f59d6adf avformat/gif: Do not write GIF89a header if loop is set to -1.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 01:18:59 +02:00
Michael Niedermayer
9e214900ad Merge remote-tracking branch 'cus/stable'
* cus/stable:
  ffplay: assume 0 stream start time if start time is unset in duration check
  ffplay: do not update audio clock with old audio pts if current frame is AV_NOPTS_VALUE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 00:57:04 +02:00
Michael Niedermayer
49f441ea89 MAINTAINERS: Update which releases are supported
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 00:47:01 +02:00
Alexis Ballier
c3ca70204b codec_desc: fix typo in rv20 long_name.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 00:27:34 +02:00
Michael Niedermayer
3aa2257d24 doc/RELEASE_NOTES: add a note about AVISynth
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 00:24:04 +02:00
Michael Niedermayer
233177a4ec jpegdec: clear EOBRUN on restarts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 23:49:06 +02:00