ffmpeg.git
6 years agoavcodec/g2meet: fix src pointer checks in kempf_decode_tile() n2.0.1
Michael Niedermayer [Wed, 7 Aug 2013 13:50:26 +0000 (15:50 +0200)]
avcodec/g2meet: fix src pointer checks in kempf_decode_tile()

Fixes Ticket2842

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoupdate for 2.0.1
Michael Niedermayer [Sat, 10 Aug 2013 21:53:37 +0000 (23:53 +0200)]
update for 2.0.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: add Alexander Strasser for the server
Michael Niedermayer [Thu, 8 Aug 2013 20:55:19 +0000 (22:55 +0200)]
MAINTAINERS: add Alexander Strasser for the server

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: remove myself from movenc, 2 maintainers should be enough
Michael Niedermayer [Thu, 8 Aug 2013 14:40:19 +0000 (16:40 +0200)]
MAINTAINERS: remove myself from movenc, 2 maintainers should be enough

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: add myself as maintainer for lavf/aiff* and lavf/movenc.c
Matthieu Bouron [Tue, 6 Aug 2013 21:08:05 +0000 (22:08 +0100)]
MAINTAINERS: add myself as maintainer for lavf/aiff* and lavf/movenc.c

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: alphabetical sort
Michael Niedermayer [Wed, 7 Aug 2013 00:58:16 +0000 (02:58 +0200)]
MAINTAINERS: alphabetical sort

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: Add some maintainers for parts of libavutil
Michael Niedermayer [Sun, 4 Aug 2013 09:43:22 +0000 (11:43 +0200)]
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 b45b1d7af93bd5b8b3824edeae3d1d54644a5361)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: order libavutil entries alphabetically
Michael Niedermayer [Sun, 4 Aug 2013 09:24:57 +0000 (11:24 +0200)]
MAINTAINERS: order libavutil entries alphabetically

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: drop 1.1 from the releases that i maintain
Michael Niedermayer [Thu, 11 Jul 2013 10:35:39 +0000 (12:35 +0200)]
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 5fe5f020b6cfb0b7137d12aab10db936cc08836f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: add myself as maintainer for the interface code to swresample & swscale...
Michael Niedermayer [Sat, 3 Aug 2013 10:36:56 +0000 (12:36 +0200)]
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 5ad4e29337483bbd3337bc47db4ad181d7e2da00)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavisynth: Exit gracefully when trying to serve video from v2.5.8.
Stephen Hutchinson [Wed, 7 Aug 2013 00:57:17 +0000 (20:57 -0400)]
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 9db353bc4727d2a184778c110cf4ea0b9d1616cb)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavisynth: Cosmetics
Stephen Hutchinson [Wed, 7 Aug 2013 00:57:16 +0000 (20:57 -0400)]
avisynth: Cosmetics

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosgidec: safer check for buffer overflow
Paul B Mahol [Fri, 26 Jul 2013 21:53:54 +0000 (21:53 +0000)]
sgidec: safer check for buffer overflow

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

Conflicts:

libavcodec/sgidec.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agottaenc: fix packet size
Paul B Mahol [Fri, 2 Aug 2013 16:45:58 +0000 (16:45 +0000)]
ttaenc: fix packet size

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskaenc: simplify mkv_check_tag()
Michael Niedermayer [Wed, 17 Jul 2013 11:30:36 +0000 (13:30 +0200)]
matroskaenc: simplify mkv_check_tag()

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

6 years agolavf/matroskaenc: Check for valid metadata before creating tags
James Almer [Wed, 17 Jul 2013 06:10:16 +0000 (03:10 -0300)]
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 088ed5314694031e07e02e9d364c9d486a60e704)

6 years agoavfilter/vf_separatefields: fix ;;
Michael Niedermayer [Fri, 19 Jul 2013 22:44:09 +0000 (00:44 +0200)]
avfilter/vf_separatefields: fix ;;

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/paf: Fix integer overflow and out of array read
Michael Niedermayer [Fri, 9 Aug 2013 11:23:10 +0000 (13:23 +0200)]
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 f58cd2867a8af2eed13acdd21d067b48249b14a1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/mem: Fix flipped condition
Michael Niedermayer [Fri, 9 Aug 2013 11:37:18 +0000 (13:37 +0200)]
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 c94f9e854228e0ea00e1de8769d8d3f7cab84a55)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter: fix plane validity checks
Michael Niedermayer [Sat, 3 Aug 2013 16:54:43 +0000 (18:54 +0200)]
avfilter: fix plane validity checks

Fixes out of array accesses

(cherry picked from commit e43a0a232dbf6d3c161823c2e07c52e76227a1bc)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/kmvc: fix MV checks
Michael Niedermayer [Mon, 29 Jul 2013 18:43:45 +0000 (20:43 +0200)]
avcodec/kmvc: fix MV checks

Fixes Ticket2813
Fixes regression since 70b5583

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

6 years agoRevert "pnm: remove nonsense code"
Paul B Mahol [Sun, 28 Jul 2013 22:00:42 +0000 (00:00 +0200)]
Revert "pnm: remove nonsense code"

Breaks decoding pgms with 255 < maxval < 65535.

Found-by: Carl Eugen Hoyos <cehoyos@ag.or.at>.
This reverts commit a0348d0966a81a66f3a1bf061576b24d5296b933.
(cherry picked from commit 768e40b451a459fefaceed6b1b3d6e70c93596ac)

6 years agojpeg2000dec: Support non subsampled 9-16bit planar pixel formats
Michael Niedermayer [Sun, 7 Jul 2013 22:58:40 +0000 (00:58 +0200)]
jpeg2000dec: Support non subsampled 9-16bit planar pixel formats

This applies changes similar to fc6de70c44be05eb0368ab519bfb790431d8dee5
to the >8bit codepath

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

6 years agojpeg2000dec: silence unused variable warning
Michael Niedermayer [Fri, 19 Jul 2013 15:54:57 +0000 (17:54 +0200)]
jpeg2000dec: silence unused variable warning

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

6 years agojpeg2000dec: Support non subsampled 8bit planar pixel formats
Michael Niedermayer [Sun, 7 Jul 2013 22:58:40 +0000 (00:58 +0200)]
jpeg2000dec: Support non subsampled 8bit planar pixel formats

Fixes file2.jp2

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

6 years agojpeg2000dec: parse CDEF
Michael Niedermayer [Sun, 7 Jul 2013 22:57:32 +0000 (00:57 +0200)]
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 99de97cabf35c035b628943b865ab991583a6ea5)

6 years agoFix pix_fmt detection in the native jpeg2000 decoder.
Carl Eugen Hoyos [Thu, 18 Jul 2013 08:56:15 +0000 (10:56 +0200)]
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 b39a6bbe7f43710d8e7163757c5aeef596878712)

6 years agojpeg2000: fix overflow in dequantization
Michael Niedermayer [Sat, 13 Jul 2013 00:24:56 +0000 (02:24 +0200)]
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 f57119b8e58cb5437c3ab40d797293ecb9b4a894)

6 years agojpeg2000: Initialize only once mqc arrays
Nicolas Bertrand [Fri, 12 Jul 2013 21:01:43 +0000 (23:01 +0200)]
jpeg2000: Initialize only once mqc arrays

Increases encoding and decoding speed

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

6 years agoavformat/dtsdec: Improve probe, reject things looking like analoge signals
Michael Niedermayer [Fri, 26 Jul 2013 02:09:30 +0000 (04:09 +0200)]
avformat/dtsdec: Improve probe, reject things looking like analoge signals

Fixes Ticket2810

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

6 years agompeg12: Ignore slice threading if hwaccel is active
Rémi Denis-Courmont [Wed, 24 Jul 2013 16:50:43 +0000 (19:50 +0300)]
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 93a51984a27f3ba84d4e6f13d0c704ee9891603e)

Conflicts:
libavcodec/mpeg12dec.c

6 years agoswscale/input: fix 16bit gbrp input
Michael Niedermayer [Fri, 19 Jul 2013 02:19:23 +0000 (04:19 +0200)]
swscale/input: fix 16bit gbrp input

Fixes Ticket2793

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

6 years agoftp: fix interrupt callback misuse
Lukasz Marek [Tue, 16 Jul 2013 21:48:16 +0000 (23:48 +0200)]
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 247e658784ead984f96021acb9c95052ba599f26)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/matroskadec: Detect conflicting sample rate/default_duration
Michael Niedermayer [Mon, 15 Jul 2013 15:13:45 +0000 (17:13 +0200)]
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 6158a3bcdf52fafc1d9ae9eb358a56c614b23aa3)

6 years agomjpegdec: Fix used quant index for gbr
Michael Niedermayer [Thu, 11 Jul 2013 00:30:56 +0000 (02:30 +0200)]
mjpegdec: Fix used quant index for gbr

Fixes Ticket1651

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomjpegdec: initialize source variables before gbr remap
Michael Niedermayer [Thu, 11 Jul 2013 00:29:46 +0000 (02:29 +0200)]
mjpegdec: initialize source variables before gbr remap

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoSuggest recompilation with openssl or gnutls if the https protocol is not found.
Carl Eugen Hoyos [Wed, 10 Jul 2013 11:16:28 +0000 (13:16 +0200)]
Suggest recompilation with openssl or gnutls if the https protocol is not found.

Fixes ticket #2765.
(cherry picked from commit 1db88c33f2c0225aae160cc412b62dfaa3a34cbc)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/utils.c: Avoid a null pointer dereference on oom after duration_error allocation.
Carl Eugen Hoyos [Wed, 10 Jul 2013 11:15:57 +0000 (13:15 +0200)]
lavf/utils.c: Avoid a null pointer dereference on oom after duration_error allocation.
(cherry picked from commit c9eb5c9751c88caaed62af5ffe908fe545022e7e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowmavoice: conceal clearly corrupted blocks
Luca Barbato [Sat, 29 Jun 2013 03:29:54 +0000 (05:29 +0200)]
wmavoice: conceal clearly corrupted blocks

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit d14a26edb7c4487df581f11e5c6911dc0e623d08)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/qdm2: initialize sign_bits
Michael Niedermayer [Wed, 10 Jul 2013 14:21:33 +0000 (16:21 +0200)]
avcodec/qdm2: initialize sign_bits

Fixes non deterministic output

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/qdm2: store bits in an integer instead of float variable
Michael Niedermayer [Wed, 10 Jul 2013 14:18:52 +0000 (16:18 +0200)]
avcodec/qdm2: store bits in an integer instead of float variable

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/utils: avformat_find_stream_info set value for ret in case of oom
Piotr Bandurski [Wed, 10 Jul 2013 12:57:15 +0000 (14:57 +0200)]
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 b0509563347b81d7b0a2474e56abbc9c99043688)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/aconvert: unbreak
Paul B Mahol [Wed, 10 Jul 2013 13:10:07 +0000 (13:10 +0000)]
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 bc95b9428950cd672162bcb2bb98fbecad52a5b3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/utils: avformat_find_stream_info fix a crash in case of oom
Piotr Bandurski [Wed, 10 Jul 2013 00:51:41 +0000 (02:51 +0200)]
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 ccf9211e29bdfad02faf93575bf39a8f89c30647)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/af_earwax: Fix out of array accesses on odd packets
Michael Niedermayer [Wed, 10 Jul 2013 14:39:10 +0000 (16:39 +0200)]
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 0a3a0edd52b98aec27d1b8c63c85cb52ff46d40e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoChangelog: replace next by 2.0 n2.0
Michael Niedermayer [Wed, 10 Jul 2013 00:47:10 +0000 (02:47 +0200)]
Changelog: replace next by 2.0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoUpdate for 2.0
Michael Niedermayer [Tue, 9 Jul 2013 23:52:51 +0000 (01:52 +0200)]
Update for 2.0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoatrac3: fix error handling
Luca Barbato [Mon, 8 Jul 2013 23:03:13 +0000 (01:03 +0200)]
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>
6 years agoavformat/gif: Do not write GIF89a header if loop is set to -1.
Eugene Dzhurinsky [Sat, 6 Jul 2013 00:27:56 +0000 (20:27 -0400)]
avformat/gif: Do not write GIF89a header if loop is set to -1.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Tue, 9 Jul 2013 22:57:00 +0000 (00:57 +0200)]
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>
6 years agoMAINTAINERS: Update which releases are supported
Michael Niedermayer [Tue, 9 Jul 2013 22:47:01 +0000 (00:47 +0200)]
MAINTAINERS: Update which releases are supported

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocodec_desc: fix typo in rv20 long_name.
Alexis Ballier [Tue, 9 Jul 2013 19:10:16 +0000 (15:10 -0400)]
codec_desc: fix typo in rv20 long_name.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/RELEASE_NOTES: add a note about AVISynth
Michael Niedermayer [Tue, 9 Jul 2013 22:24:04 +0000 (00:24 +0200)]
doc/RELEASE_NOTES: add a note about AVISynth

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpegdec: clear EOBRUN on restarts
Michael Niedermayer [Tue, 9 Jul 2013 21:46:29 +0000 (23:46 +0200)]
jpegdec: clear EOBRUN on restarts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpegdec: give handle_rstn() a return code that indicates if restart did happen
Michael Niedermayer [Tue, 9 Jul 2013 21:45:31 +0000 (23:45 +0200)]
jpegdec: give handle_rstn() a return code that indicates if restart did happen

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomjpeg_decode_scan: reset restart state
Michael Niedermayer [Tue, 9 Jul 2013 21:43:36 +0000 (23:43 +0200)]
mjpeg_decode_scan: reset restart state

Fixes Ticket2082
Fixes progressive/refinement + restart jpegs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/ffmpeg: document -override_ffserver
Michael Niedermayer [Tue, 9 Jul 2013 19:42:27 +0000 (21:42 +0200)]
doc/ffmpeg: document -override_ffserver

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosnowenc: check minimum resolution
Michael Niedermayer [Tue, 9 Jul 2013 19:10:45 +0000 (21:10 +0200)]
snowenc: check minimum resolution

Fixes Ticket1855

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: assume 0 stream start time if start time is unset in duration check
Marton Balint [Sun, 7 Jul 2013 00:54:22 +0000 (02:54 +0200)]
ffplay: assume 0 stream start time if start time is unset in duration check

Fixes ticket #2103 and #2743.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: do not update audio clock with old audio pts if current frame is AV_NOPTS_VALUE
Marton Balint [Sat, 6 Jul 2013 18:47:12 +0000 (20:47 +0200)]
ffplay: do not update audio clock with old audio pts if current frame is AV_NOPTS_VALUE

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agobitstream: fix a crash in case of oom
Piotr Bandurski [Tue, 9 Jul 2013 17:29:26 +0000 (19:29 +0200)]
bitstream: fix a crash in case of oom

fixes ticket #2766

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovorbiscomment: Add support for embedded cover art
James Almer [Tue, 9 Jul 2013 05:39:10 +0000 (02:39 -0300)]
vorbiscomment: Add support for embedded cover art

Fixes ticket #2655

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/flacdec: Share the function to parse cover art blocks
James Almer [Tue, 9 Jul 2013 05:39:09 +0000 (02:39 -0300)]
lavf/flacdec: Share the function to parse cover art blocks

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/AVFormatContext: Move fields down to match the fork
Michael Niedermayer [Tue, 9 Jul 2013 16:34:01 +0000 (18:34 +0200)]
avformat/AVFormatContext: Move fields down to match the fork

avconv uses private and internal fields from libavformat, we thus must
match the layout even of the fields marked non public.
Otherwise ffmpegs libavformat could not be used as a dropin replacement
on debian/ubuntu

The current soname of libavformat was not part of any release nor are any
fields marked public moved thus in theory
no installed shared lib ABI breakage should occur. Still the need for this
change is unfortunate and chilling.
If you installed shared libs from a recent development version of libavformat
that is more recent than the last release. You probably want to check or rebuild
applications that linked to it.

minor versions of avformat & avdevice are bumped to allow detecting this
as both use the updated struct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/graphparse: Fix build with --enable-incompatible-fork-abi
Michael Niedermayer [Tue, 9 Jul 2013 16:10:33 +0000 (18:10 +0200)]
avfilter/graphparse: Fix build with --enable-incompatible-fork-abi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/drawtext: add support for printing frame metadata
Paul B Mahol [Mon, 8 Jul 2013 18:55:08 +0000 (18:55 +0000)]
lavfi/drawtext: add support for printing frame metadata

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoimc: Catch a division by zero
Luca Barbato [Tue, 9 Jul 2013 07:19:30 +0000 (09:19 +0200)]
imc: Catch a division by zero

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Kostya Shishkov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/wmaprodec: Check block_align
Michael Niedermayer [Tue, 9 Jul 2013 12:01:13 +0000 (14:01 +0200)]
avcodec/wmaprodec: Check block_align

Fixes undefined behavior
Its not known if this condition can be triggered through crafted input.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Tue, 9 Jul 2013 11:04:46 +0000 (13:04 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Force correct extradata for AVID AVCI50 in mov.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoff_lpc_calc_coefs: assert that the type is levinson or cholesky
Michael Niedermayer [Tue, 9 Jul 2013 09:19:27 +0000 (11:19 +0200)]
ff_lpc_calc_coefs: assert that the type is levinson or cholesky

Otherwise the code could misbehave (and there are no other types anyway)
Fixes CID700759

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoForce correct extradata for AVID AVCI50 in mov.
Carl Eugen Hoyos [Tue, 9 Jul 2013 08:19:21 +0000 (10:19 +0200)]
Force correct extradata for AVID AVCI50 in mov.

Fixes ticket #2106.

Reviewed-by: Kieran Kunhya
6 years agolavfi/psnr: rename 's' parameter to match documentation
Paul B Mahol [Tue, 9 Jul 2013 09:38:47 +0000 (09:38 +0000)]
lavfi/psnr: rename 's' parameter to match documentation

Also removes some irrelevant lines in documentation.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoffmpeg_opt: do not warn about unused gop_timecode
Michael Niedermayer [Tue, 9 Jul 2013 08:54:40 +0000 (10:54 +0200)]
ffmpeg_opt: do not warn about unused gop_timecode

The option is injected by generic code and being sometimes unused is normal.

Fixes Ticket2762

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 9 Jul 2013 08:07:01 +0000 (10:07 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Rename the timestamp parameter to dts in write_hint_packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a87a0acf9b5d27aad032e61eef4973e62a4a6830'
Michael Niedermayer [Tue, 9 Jul 2013 07:59:29 +0000 (09:59 +0200)]
Merge commit 'a87a0acf9b5d27aad032e61eef4973e62a4a6830'

* commit 'a87a0acf9b5d27aad032e61eef4973e62a4a6830':
  movenc: Make sure the RTP hint tracks have nondecreasing DTS

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264_ps: try to support Ambarella AVC
Michael Niedermayer [Tue, 9 Jul 2013 03:21:26 +0000 (05:21 +0200)]
avcodec/h264_ps: try to support Ambarella AVC

Fixes Ticket2763

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoWebM muxer writes WebVTT subtitle track
Matthew Heaney [Mon, 8 Jul 2013 23:25:30 +0000 (16:25 -0700)]
WebM muxer writes WebVTT subtitle track

The Matroska muxer now allows WebVTT subtitle tracks to be written
while in WebM muxing mode.

WebVTT subtitle tracks have four kinds: "subtitles", "captions",
"descriptions", and "metadata". Each text track kind has a distinct
Mastroska CodecID and track type, as described in the temporal
metadata guidelines here:

http://wiki.webmproject.org/webm-metadata/temporal-metadata/webvtt-in-webm

When the stream has codec id AV_CODEC_ID_WEBVTT, the stream packet is
serialized per the temporal metadata guidelines cited above. The
WebVTT cue is written as a Matroska block group. The block frame
comprises the WebVTT cue id, followed by the cue settings, followed by
the cue text.  (The block timestamp is synthesized from the cue
timestamp.)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/libvpxenc: make class names unique
Michael Niedermayer [Tue, 9 Jul 2013 00:57:05 +0000 (02:57 +0200)]
avcodec/libvpxenc: make class names unique

This should fix an infinite loop with -h full

Found-by: <Foofie>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: Allow overriding ffservers input
Michael Niedermayer [Mon, 8 Jul 2013 23:48:29 +0000 (01:48 +0200)]
ffmpeg: Allow overriding ffservers input

Fixes Ticket1970

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: move creation_time for ffserver setting up
Michael Niedermayer [Mon, 8 Jul 2013 23:40:11 +0000 (01:40 +0200)]
ffmpeg: move creation_time for ffserver setting up

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: fix broken logic in metadata handling
Paul B Mahol [Mon, 8 Jul 2013 20:13:14 +0000 (20:13 +0000)]
lavfi: fix broken logic in metadata handling

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agompeg12dec: avoid reinitializtation on PS changes when possible.
Michael Niedermayer [Mon, 8 Jul 2013 19:46:20 +0000 (21:46 +0200)]
mpeg12dec: avoid reinitializtation on PS changes when possible.

Fixes Ticket2574

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotests/fate/filter-audio: update asyncts reference
Michael Niedermayer [Mon, 8 Jul 2013 17:30:37 +0000 (19:30 +0200)]
tests/fate/filter-audio: update asyncts reference

The new reference matches the one used by qatar

Fixes: fate-filter-asyncts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/rotate: switch to new drawutils
Paul B Mahol [Mon, 8 Jul 2013 15:12:11 +0000 (15:12 +0000)]
lavfi/rotate: switch to new drawutils

Get rid of ugly hacks, also add support for more pixel formats.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/drawutils: fix planar rgb
Paul B Mahol [Mon, 8 Jul 2013 15:17:33 +0000 (15:17 +0000)]
lavfi/drawutils: fix planar rgb

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/pad: use FFSIGN
Paul B Mahol [Mon, 8 Jul 2013 15:33:40 +0000 (15:33 +0000)]
lavfi/pad: use FFSIGN

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavformat/mov: read stream bitrates from isml manifest
Alexandre Sicard [Mon, 8 Jul 2013 09:56:40 +0000 (11:56 +0200)]
avformat/mov: read stream bitrates from isml manifest

This allows to read a live isml movie and segment it using the
smoothstreaming muxer, which requires the bitrates to be known for each stream.

Signed-off-by: Alexandre Sicard <alexandre.sicard@smartjog.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomp3dec: detect CBR and use CBR axiom to seek
Michael Niedermayer [Sun, 7 Jul 2013 11:15:32 +0000 (13:15 +0200)]
mp3dec: detect CBR and use CBR axiom to seek

This should also work reasonable with truncated and growing mp3s.
Fixes Ticket2590

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: add psnr filter
Paul B Mahol [Sat, 6 Jul 2013 00:21:12 +0000 (00:21 +0000)]
lavfi: add psnr filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoswscale: treat gray as a fullrage (0-255) format
Michael Niedermayer [Sat, 6 Jul 2013 00:37:28 +0000 (02:37 +0200)]
swscale: treat gray as a fullrage (0-255) format

Fixes Ticket2684

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoCheck the return value of ff_rv34_decode_init() in rv30.c and rv40.c
Carl Eugen Hoyos [Sun, 7 Jul 2013 22:34:58 +0000 (00:34 +0200)]
Check the return value of ff_rv34_decode_init() in rv30.c and rv40.c

Avoids possible null pointer dereferences on oom.

Fixes ticket #2727.

6 years agomovenc: Rename the timestamp parameter to dts in write_hint_packets
Martin Storsjö [Sun, 7 Jul 2013 14:03:00 +0000 (17:03 +0300)]
movenc: Rename the timestamp parameter to dts in write_hint_packets

This matches its actual intended use better.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomovenc: Make sure the RTP hint tracks have nondecreasing DTS
Martin Storsjö [Sun, 7 Jul 2013 13:55:26 +0000 (16:55 +0300)]
movenc: Make sure the RTP hint tracks have nondecreasing DTS

The RTP timestamps can be decreasing for codecs with B-frames. For
these cases, make sure the timestamps in the MP4 file track itself
are nondecreasing, and add an offset to the RTP packet hint instead
to produce the intended RTP timestamp.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agocmdutils: replace exit() by exit_program()
Michael Niedermayer [Mon, 8 Jul 2013 09:10:02 +0000 (11:10 +0200)]
cmdutils: replace exit() by exit_program()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg_opt: replace exit() by exit_program()
Michael Niedermayer [Mon, 8 Jul 2013 09:09:42 +0000 (11:09 +0200)]
ffmpeg_opt: replace exit() by exit_program()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg_filter: replace exit() by exit_program()
Michael Niedermayer [Mon, 8 Jul 2013 09:09:22 +0000 (11:09 +0200)]
ffmpeg_filter: replace exit() by exit_program()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 8 Jul 2013 03:15:10 +0000 (05:15 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  qdm2: check and reset dithering index per channel

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad'
Michael Niedermayer [Mon, 8 Jul 2013 03:10:06 +0000 (05:10 +0200)]
Merge commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad'

* commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad':
  qdm2: formatting cosmetics

Conflicts:
libavcodec/qdm2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f054e309c58894450a5d18cce9799ef58aab9f14'
Michael Niedermayer [Mon, 8 Jul 2013 03:02:52 +0000 (05:02 +0200)]
Merge commit 'f054e309c58894450a5d18cce9799ef58aab9f14'

* commit 'f054e309c58894450a5d18cce9799ef58aab9f14':
  qdm2: use init_static_data
  westwood_vqa: do not free extradata on error in read_header

Conflicts:
libavformat/westwood_vqa.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0'
Michael Niedermayer [Mon, 8 Jul 2013 02:48:39 +0000 (04:48 +0200)]
Merge commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0'

* commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0':
  vqavideo: check the version

Conflicts:
libavcodec/vqavideo.c

See: b226af39107f09cd650875388250f4968eea54db

Merged-by: Michael Niedermayer <michaelni@gmx.at>