41273 Commits

Author SHA1 Message Date
Michael Niedermayer
3bcf733b5a cmdutils: update year
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-08 15:32:44 +01:00
Michael Niedermayer
84c84204b3 avcodec/jpeglsdec: check err value for ls_get_code_runterm()
Fixes infinite loop
Fixes Ticket3086

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-08 15:32:44 +01:00
Michael Niedermayer
683c92adde avutil/opt: initialize ret
Fixes CID1108610
Fixes use of uninitialized variable

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-08 15:32:43 +01:00
Michael Niedermayer
82746c468b avcodec/avpacket/av_packet_split_side_data: ensure that side data padding is initialized
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 240fd8c96f59ebe9dcfc4152a1086cd3f63400c0)

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-08 15:32:43 +01:00
Michael Niedermayer
3b03778d35 avfilter/ff_insert_pad: fix order of operations
Fixes out of bounds access
Fixes CID732170
Fixes CID732169

No filter is known to use this function in a way so the issue can be reproduced.

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

Conflicts:

	libavfilter/avfilter.c
(cherry picked from commit 86591b244f3a27293153896813f5569b49b2f5c0)

Conflicts:

	libavfilter/avfilter.c
(cherry picked from commit 400c4f8fa3fd58951dc3f356b2b00484e3363694)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-08 15:32:43 +01:00
Michael Niedermayer
2289bffa31 avcodec/parser: reset indexes on realloc failure
Fixes Ticket2982

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-08 15:32:43 +01:00
Michael Niedermayer
b650d5376c avcodec/ffv1enc: update buffer check for 16bps
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3728603f1854b5c79d1a64dd3b41b80640ef1e7f)

Conflicts:

	libavcodec/ffv1enc.c
(cherry picked from commit c900c6e5c26cd86cf34f9c8d4347cedbd01f3935)
2014-03-08 15:32:43 +01:00
Michael Niedermayer
ec39abcd37 avcodec/truemotion2: Fix av_freep arguments
Fixes null pointer dereference
Fixes Ticket2944

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

Conflicts:

	libavcodec/truemotion2.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-08 15:32:43 +01:00
Michael Niedermayer
66fcda7e70 avcodec/mjpegdec: Add some sanity checks to ljpeg_decode_rgb_scan()
These prevent the rgb ljpeg code from being run on parameters that it doesnt
support. No testcase available but it seems possible to trigger these.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-08 15:32:43 +01:00
Michael Niedermayer
ceff07dfb9 avfilter/vf_fps: make sure the fifo is not empty before using it
Fixes Ticket2905

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

Conflicts:

	libavfilter/vf_fps.c
2014-03-08 15:32:43 +01:00
Michael Niedermayer
fdf57ad2ff avcodec/dsputil: fix signedness in sizeof() comparissions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 454a11a1c9c686c78aa97954306fb63453299760)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-08 15:32:43 +01:00
Martin Storsjö
69f724a538 arm: Don't clobber callee saved registers in scalarproduct
q4-q7/d8-d15 are supposed to not be clobbered by the callee.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit d307e408d4a9ada22df443cc38be77cc5e492694)
2013-12-21 10:00:18 +01:00
Michael Niedermayer
929100ae98 avcodec/cabac: force get_cabac to be not inlined
works around bug in gccs inline asm register assignment
Fixes Ticket3177

gcc from 4.4 to 4.6 is affected at least, no non affected gccs known
clang seems not affected

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0538b29ae8002c44f27bae8a1a6fc6e646998be5)
2013-12-09 10:40:08 +01:00
Michael Niedermayer
b89e5b138f avformat/utils: do not override pts in h264 when they are provided from the demuxer
Fixes Ticket2143

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1e5271a9fd6ddcceb083f2185a4bbd8d44c9a813)
2013-10-27 19:50:29 +01:00
Michael Niedermayer
d49761b396 avcodec/h264: reduce noisiness of "mmco: unref short failure"
Do not consider it an error if we have no frames and should discard one.
This condition can easily happen when decoding is started from an I frame

Fixes Ticket2811

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

Conflicts:
	libavcodec/h264_refs.c
2013-10-26 01:26:00 +02:00
Michael Niedermayer
43af9624fe avformat/mov: force parsing of headers if stts is absent
Fixes Ticket2991

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e41ea866fc26f38d770bbc1ad67703e7f4400ae1)
2013-10-24 11:41:01 +02:00
Michael Niedermayer
87f719a03f avcodec/h264_refs: modify key frame detection heuristic to detect more cases
Fixes Ticket2968

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

Conflicts:
	libavcodec/h264_refs.c
(cherry picked from commit 6636dd551fda4fac77f2caa25d24d81abcadcd71)
2013-10-24 11:40:01 +02:00
Michael Niedermayer
5df35d9a21 avformat/wavdec: Dont trust the fact chunk for PCM
Fixes Ticket3033

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

Conflicts:
	libavformat/wav.c
(cherry picked from commit 89b5f5f494a2387541de8960839c2539a73a31fa)
2013-10-24 11:37:29 +02:00
Carl Eugen Hoyos
a5ef62ede1 Avoid a deadlock when decoding wma.
Fixes ticket #2925.
(cherry picked from commit ec8a4841f7e81040f9a2757f23e70dff5e6b33a4)
2013-09-02 10:03:49 +02:00
Michael Niedermayer
d3ef17740d avformat/avidec: match first index and first packet size=0 handling
Fixes Ticket2861

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

Conflicts:
	libavformat/avidec.c
2013-08-31 09:38:15 +02:00
Michael Niedermayer
2d945ac68f avcodec/pngdsp: fix (un)signed type in end comparission
Fixes out of array accesses
Fixes Ticket2919

Found_by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 86736f59d6a527d8bc807d09b93f971c0fe0bb07)
2013-08-30 23:42:00 +02:00
Michael Niedermayer
6fd54e4f2e update for 0.11.4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
n0.11.4
2013-08-28 01:43:36 +02:00
Stefano Sabatini
4f74cb9334 doc/texi2pod.pl: skip printing chapter names if they are disabled
(cherry picked from commit c838701ce4515bd51f7827be0b20f256ba5c69f3)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-27 09:02:59 -07:00
Stefano Sabatini
3726425d51 doc/texi2pod: rework man inclusion logic
Ignore @c man begin ... @c man end comments, rely on @chapter for marking
the beginning of the various manual top level sections.

This allows us to write markup which is not dependent on the specific
texi2pod.pl implementation.

This change causes a few rendering issues, which will be fixed in further
patches.
(cherry picked from commit ca3d786227adf20f4e19809090c980d6d1109bf8)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-27 09:02:59 -07:00
Stefano Sabatini
bdeb7b6176 doc/texi2pod: fix @ref substitution rule, disallow "}" within the fields
Fix potential spurious substitution.
(cherry picked from commit 9167db3829f360f241255d4240ba6b7135ab4111)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-27 09:02:59 -07:00
Stefano Sabatini
7231c30bff doc/texi2pod: fix warnings introduced in e7e14bc69a606a6bec82efef729263cd38f122d4
The variable "$section" was replaced by "$chapter".
(cherry picked from commit c0c06c1bba80c4bee162a3c40eec678ddc65571d)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-27 09:02:59 -07:00
Luca Barbato
6ec4cda182 doc: support multitable in texi2pod
(cherry picked from commit 5ea5ffc9cee1b91eed471fff2f51d771222cf8d2)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-27 09:02:59 -07:00
Stefano Sabatini
ae224c924e doc/texipod: add rule to correctly interpret @ref{ANCHOR,XREF,SECTION_NAME,...}
This allows to name an internal reference in the POD/MAN output.
(cherry picked from commit c499d45c6bea8d7bbbb7a819c53fe9766136bf29)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-27 09:02:59 -07:00
Stefano Sabatini
d56dd43c50 doc/texi2pod: correctly handle @url commands in the form @url{URL,...}
Ignore the other arguments, which have not to be processed by the POD
renderer.
(cherry picked from commit 1f9855dbc1102e63fa7ce932d0edf0d545c89b09)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-27 09:02:59 -07:00
Stefano Sabatini
646bcc37e6 doc/texi2pod: add support to @ifhtml and @ifnothtml directives
With these commands it is possible to add HTML and non-HTML snippets,
which will be useful for the "See Also" manual chapters.
(cherry picked from commit f14e248783f45a698947a2ed6e2c82069db46bc8)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-27 09:02:59 -07:00
Nicolas George
6469c199b4 doc/texi2pod: recognize @table @command.
(cherry picked from commit ee2d6fbc92e6d55dda319fa56234c5be9a476728)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-27 09:02:59 -07:00
Stefano Sabatini
f00e882a1f doc/texi2pod.pl: drop unnecessary rule, which was converting "\," to ","
I cannot find a reason for such a rule, which was resulting in badly
escaped filtergraph snippets.

Fix trac ticket #1610.
(cherry picked from commit ce875a613a16b06b0a561774955111f7a24d12bb)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-27 09:02:59 -07:00
Stefano Sabatini
e8cae38be6 doc/texi2pod: add "use warnings" directive
The script was previously run with perl -w through the shebang
command. Now that the script is executed through direct perl invocation
the -w in the shebang command is ignored. This patch re-enables "use
warnings" whatever way the script is invoked.

Idea-By: jamal <jamrial@gmail.com>
(cherry picked from commit 3239382aefd0f5fa9ffd1509ccaedd59a54ec9af)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-27 09:02:59 -07:00
Timothy Gu
0ff11fd07e doc/encoders: Remove reference to "Codec Options" chapter
The chapter is only presented in later release branches.
(cherry picked from commit 7364109d255ff5583c9a3930830e28f5b1f0adce)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-27 09:02:58 -07:00
Timothy Gu
08f5567a0c doc/encoders: add libxvid doc
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 6b255e5e70c72aa59ff7aed74b4ee976223eb140)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

Conflicts:
	doc/encoders.texi
2013-08-27 09:02:58 -07:00
Timothy Gu
608950bc72 doc/muxers: Add AIFF doc
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 4ec46b1160eb549a551823c168905b43922add31)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-27 09:02:58 -07:00
Timothy Gu
134022ad74 doc/encoders: alphabetically list the encoders
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 934df3b0375743ae2b03168a4174edb9f88a6889)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

Conflicts:
	doc/encoders.texi
2013-08-27 09:02:58 -07:00
Timothy Gu
3bba59bd80 doc/decoders: Add libopencore-amrwb decoder doc
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 83647ace735d1707d4b28345ef77fefe525ea52e)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-27 09:02:58 -07:00
Timothy Gu
3adf1859ee doc/decoders: Document libopencore-amrnb decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b43860ee0c27279f2fa020ea965c03d359f8f45c)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-27 09:02:58 -07:00
Timothy Gu
97a24e7638 doc/decoders: Document libilbc decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8cdea50f6eee1271e24ff0c9590522f8323e87fe)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-27 09:02:58 -07:00
Timothy Gu
d559cfb5bd doc/decoders: Document libgsm decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c16496c3770fa083472ab86146c18dc96c1feea7)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-27 09:02:58 -07:00
Timothy Gu
66bfbabafc doc/encoders: Add libopencore-amrnb doc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9ead06057acfcc43bcb99a63a7c58543007b2847)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-27 09:02:58 -07:00
Timothy Gu
d746579221 doc/decoders: Document libcelt
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e3580449221c79cf611995dc7e2fcb61dd867d4c)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-27 09:02:57 -07:00
Timothy Gu
960e591e46 doc/encoders: Add libvo-amrwbenc doc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0ec65aa1046a4417d5c7dfcf8faeecde60e3fe00)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

Conflicts:
	doc/encoders.texi
2013-08-27 09:02:57 -07:00
Timothy Gu
8d0c2755d3 doc/encoders: Add libvo-aacenc doc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ba7cb4807f050c401f8fd7ef1d1065b138358135)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

Conflicts:
	doc/encoders.texi
2013-08-27 09:02:57 -07:00
Timothy Gu
56ff47c9a5 doc/encoders: Add documentation for libmp3lame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4703a345fb41b14fe28f7e6bf7f60bb2213aa9e0)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-27 09:02:57 -07:00
Michael Niedermayer
cbf7335940 matroska_read_seek: Fix used streams for subtitle index compensation
Might fix Ticket1907 (I have no testcase so i cant test)

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-26 21:58:56 +02:00
Michael Niedermayer
97f739ac9b avformat/matroskadec: check out_samplerate before using it in av_rescale()
Prevent assertion failure with damaged input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 338f8b2eaf36f078eb5cc26ac10e651dc4c48243)
2013-08-25 23:35:10 -03:00
James Almer
c447047117 matroskadec: Improve TTA duration calculation
Calculate the duration as accurately as possible to improve decoding of samples
where the last frame is smaller than the rest.

Signed-off-by: James Almer <jamrial@gmail.com>
Approved-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit af248fa1174200acb537a6ab1198bb2fed38e884)

Conflicts:
	libavformat/matroskadec.c
2013-08-25 19:40:11 -03:00
Michael Niedermayer
11bc88eebd matroskaenc: simplify mkv_check_tag()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 066111bf19518a9f4d836991b34dbfc5ab72a41a)
2013-08-25 19:37:05 -03:00