Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-10-03update for 1.2.4n1.2.4Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03Merge remote-tracking branch 'TimothyGu/release/1.2' into release/1.2Michael Niedermayer
* TimothyGu/release/1.2: doc/encoders: add doc for AAC encoder doc/encoders: improve libvo-aacenc doc doc/ffmpeg-formats: Add documentation for 3 parameters that have been missing doc/encoders: Remove options that were not there when branch was cut from master doc/encoders: reformat and add some clarification in libtwolame doc doc/encoders: reformat libmp3lame doc Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03avcodec/parser: reset indexes on realloc failureMichael Niedermayer
Fixes Ticket2982 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f31011e9abfb2ae75bb32bc44e2c34194c8dc40a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03avcodec/ffv1enc: update buffer check for 16bpsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3728603f1854b5c79d1a64dd3b41b80640ef1e7f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03avcodec/truemotion2: Fix av_freep argumentsMichael Niedermayer
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>
2013-10-03avcodec/mjpegdec: Add some sanity checks to ljpeg_decode_rgb_scan()Michael Niedermayer
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>
2013-10-03avfilter/vf_fps: make sure the fifo is not empty before using itMichael Niedermayer
Fixes Ticket2905 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cdd5df8189ff1537f7abe8defe971f80602cc2d2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03avcodec/dsputil: fix signedness in sizeof() comparissionsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 454a11a1c9c686c78aa97954306fb63453299760) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03ffv1dec: Check bits_per_raw_sample and colorspace for equality in ver 0/1 ↵Michael Niedermayer
headers Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b05cd1ea7e45a836f7f6071a716c38bb30326e0f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03ffv1dec: check that global parameters dont change in version 0/1Michael Niedermayer
Such changes are not allowed nor supported Fixes Ticket2906 Found-by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 547d690d676064069d44703a1917e0dab7e33445) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03avcodec/ffv1dec: check global header versionMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 20b965a1a43ae88b7ae95635d5a3570e7dc2bbd4) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23doc/encoders: add doc for AAC encoderTimothy Gu
Thanks-to: Kostya Shishkov <kostya.shishkov@gmail.com> Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit 0e11790cf7eef3b0f38a64486da1e3fb8c7f14b8) Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-09-23doc/encoders: improve libvo-aacenc docTimothy Gu
Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit 81bbe49a0e588aa899f37a567808ba8926d798d6) Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-09-23doc/ffmpeg-formats: Add documentation for 3 parameters that have been missingTimothy Gu
Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b7dd4598630fb1f890ae060f21a9ec92a103f22d) Signed-off-by: Timothy Gu <timothygu99@gmail.com> Conflicts: doc/formats.texi
2013-09-23doc/encoders: Remove options that were not there when branch was cut from masterTimothy Gu
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-09-23doc/encoders: reformat and add some clarification in libtwolame docTimothy Gu
Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit e45e72f5f89ef5a5791562cfcb935028b46ecd0a) Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-09-23doc/encoders: reformat libmp3lame docTimothy Gu
Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit 40b8350b57adaa9aaf6731bac5130d4fec1639c3) Conflicts: doc/encoders.texi
2013-09-16avcodec/srtdec: fix potential overread.Clément Bœsch
(cherry picked from commit 3a54c221d574ec944db1eddf9df895808f32bf9e) Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
2013-09-16avformat/subtitles: add a next line jumper and use it.Clément Bœsch
This fixes a bunch of possible overread in avformat with the idiom p += strcspn(p, "\n") + 1 (strcspn() can focus on the trailing '\0' if no '\n' is found, so the +1 leads to an overread). Note on lavf/matroskaenc: no extra subtitles.o Makefile dependency is added because only the header is required for ff_subtitles_next_line(). Note on lavf/mpsubdec: code gets slightly complex to avoid an infinite loop in the probing since there is no more forced increment. NOTE: Code of function ff_subtitles_next_line fixed by Alexander Strasser. The original code from master did test the wrong character, but was corrected by a subsequent commit. That commit however is not backported, so it had to be fixed in this commit for the backport. Conflicts: libavformat/mpl2dec.c (cherry picked from commit 90fc00a623de44e137fe1601b91356e8cd8bdd54) Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
2013-09-16avformat/srtdec: skip initial random line breaks.Clément Bœsch
I found a bunch of (recent) SRT files in the wild with 3 to 10 line breaks at the beginning. (cherry picked from commit cfcd55db164e0acc0c30b2cf084e6eebe9741d34) Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
2013-09-13Use rc_max_rate if no video bit_rate was specified when muxing mxf_d10.Carl Eugen Hoyos
Fixes ticket #2945. Reviewed-by: Matthieu Bouron (cherry picked from commit d73565d5ddf41d4b7805327cdb271c59d8c3fc59)
2013-09-13Store the video bit_rate in the context when muxing mxf.Carl Eugen Hoyos
This will allow using rc_max_rate if no bit_rate is specified (on remuxing). Reviewed-by: Matthieu Bouron (cherry picked from commit 52cf08b4c8859f7cac010a7a59f7aa369384ad85)
2013-09-10avformat/subtitles: check lower bound for duration overlap seeking.Clément Bœsch
(cherry picked from commit 1ca4bf930bab681a79fb591330043675c7cfd798)
2013-09-10avformat/vobsub: fix seeking.Clément Bœsch
(cherry picked from commit f8678dcef3c5b0ea82e898e1f419863409fa135f)
2013-09-09avformat/matroskaenc: remove bogus prores tagPaul B Mahol
Fixes: ffmpeg -i input -c:v prores output.mkv Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit 14851ca5f5a3af140085e82589e28e06c7cdefdc) Conflicts: libavformat/matroskaenc.c
2013-09-06Read h264 headers from v4l2 to allow stream-copying.Carl Eugen Hoyos
Fixes ticket #2882. Analyzed and tested by William C Bonner. (cherry picked from commit e337c9d56408dc00a15887309488a1ff5cb06ba3)
2013-09-06w64dec: fix end position of summarylist guidPaul B Mahol
Noticed-by: James Almer Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit 3e36dc8626f4721ea749286dae40169ee5cb7d04)
2013-09-06w64dec: fix skipping of unknown guidsPaul B Mahol
Regression since 14d50c1. Fixes #2932. Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit 79b70e47a463057a3a48353ee1dd58671c11f86c)
2013-09-02Avoid a deadlock when decoding wma.Carl Eugen Hoyos
Fixes ticket #2925. (cherry picked from commit ec8a4841f7e81040f9a2757f23e70dff5e6b33a4)
2013-09-01avformat/lxfdec: use a parser to parse video frame headersMichael Niedermayer
lxf needs a parser (or would need to set a few fields explicitly). Fixes Ticket2917 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8349be852be7f68fe0590584fd46c4d5f1c16b3d)
2013-09-01avcodec/h264: set er.ref_count earlierMichael Niedermayer
Fixes Ticket2910 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 93cf7b01950b9d8e1646227752b522d0275d32df)
2013-08-31avformat/avidec: match first index and first packet size=0 handlingMichael Niedermayer
Fixes Ticket2861 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 227a0eb5a92409572f2cecde6137529b83e7d495) Conflicts: libavformat/avidec.c
2013-08-31avcodec/pngdsp: fix (un)signed type in end comparissionMichael Niedermayer
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-27doc/codecs: fix dangling reference to codec-options chaptern1.2.3Stefano Sabatini
(cherry picked from commit b4bd21b7fe2ad8be59b16538448586814e5db65b) Signed-off-by: Timothy Gu <timothygu99@gmail.com> Conflicts: doc/codecs.texi
2013-08-27update for 1.2.3Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-26doc/filters: review introductory example and explanationStefano Sabatini
In particular, fix wrong vertical mirroring command, and clarify and extend explanation. Based on a patch by littlebat <dashing.meng@gmail.com>. Should fix trac ticket #2413. (cherry picked from commit 215ca864759a54f45265a51ac57dbfd75cb23da2) Signed-off-by: Timothy Gu <timothygu99@gmail.com> Conflicts: doc/filters.texi
2013-08-26doc/encoders: add libxvid docTimothy Gu
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-26doc/encoders: partially rewrite and reformat libx264 docsTimothy Gu
Format is based on the thread: "[PATCH] doc/encoders: Add libopus encoder doc" (06-28-2013) http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/165368/ Also merge the two option sections (Mapping and Private options). Patch partially edited by Stefano Sabatini. Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit 11cb697501edf6447a718d6194f0e63ec2310d39) Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-26doc/encoders: add libopus encoder docTimothy Gu
Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit 561e05136f1cbe28a79af1940aa137f70281eef4) Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-26doc/muxers: Add AIFF docTimothy Gu
Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit 4ec46b1160eb549a551823c168905b43922add31) Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-26doc/decoders: document libopus decoderTimothy Gu
Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit 7eb5288f17aad81d5bd1b4d3d46533e457df262c) Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-26doc/encoders: alphabetically list the encodersTimothy Gu
Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit 934df3b0375743ae2b03168a4174edb9f88a6889) Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-26doc/decoders: Add libopencore-amrwb decoder docTimothy Gu
Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit 83647ace735d1707d4b28345ef77fefe525ea52e) Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-26doc/decoders: Document libopencore-amrnb decoderTimothy Gu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b43860ee0c27279f2fa020ea965c03d359f8f45c) Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-26doc/decoders: Document libilbc decoderTimothy Gu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8cdea50f6eee1271e24ff0c9590522f8323e87fe) Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-26doc/decoders: Document libgsm decoderTimothy Gu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c16496c3770fa083472ab86146c18dc96c1feea7) Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-26doc/encoders: Add libopencore-amrnb docTimothy Gu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 9ead06057acfcc43bcb99a63a7c58543007b2847) Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-26doc/decoders: Document libceltTimothy Gu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e3580449221c79cf611995dc7e2fcb61dd867d4c) Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-26doc/general: Make the license status of the Android libraries clearerTimothy Gu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6fe419bf73146655961a373c734e9e4d8826c835) Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-08-26doc/encoders: Add libvo-amrwbenc docTimothy Gu
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 12:55:31 +0300