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
2012-09-23lavf: document request_probe properlyMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-23lavf: allow using request_probe as a score threshold to accept a codecMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-22rtsp: fix "warning: ret may be used uninitialized in this function"Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-22rtsp: kill a pointer type warning (void **) vs. (AVFormatContext **)Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-22lavf/oggdec: check for begin-of-stream flag in case of chained streams.Clément Bœsch
Fix Ticket #1617, revealing a regression I introduced in 8f3eebd. We need to make sure no stream is added in between Ogg context save and restore operations (because it would likely lead to a mismatch between ogg->nstreams and AVFormatContext->nb_streams after the restore op). This is the reason the ogg->state check is added in ogg_new_stream(). Before this patch, checking for ogg->headers was preventing this: ogg->headers is always set before any ogg save/restore (though, it was also preventing from creating the stream when necessary).
2012-09-21mxf: export ff_mxf_get_samples_per_frame to lavfMatthieu Bouron
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-21lavf/movenc: add F4V flavor.Clément Bœsch
2012-09-21Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: libx264: add forgotten ; matroskadec: fix a sanity check. matroskadec: only return corrupt packets that actually contain data lavf: zero data/size of the packet passed to read_packet(). ARM: use 2-operand syntax for ADD Rd, PC in Apple PIC code ARM: align PIC offset pools to 4 bytes ARM: swap source operands in some add instructions configure: update tms470 detection for latest version lavf probe: prevent codec probe with no data at all seen motion_est: fix use of inline on extern functions Conflicts: libavcodec/motion_est_template.c libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-21matroskadec: fix a sanity check.Anton Khirnov
2012-09-21matroskadec: only return corrupt packets that actually contain dataAnton Khirnov
Fixes bug 372.
2012-09-21lavf: zero data/size of the packet passed to read_packet().Anton Khirnov
2012-09-21nutdec: fix mixup of nb_streams and timebase_countMichael Niedermayer
Fixes out of array read, should fix ffprove fate failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-21nutdec: fix type of intermediate variable for ts calculation.Michael Niedermayer
Prior to this it could theoretically become negative and read out of array. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-21matroskadec: matroska_parse_rm_audio: remove unused parameterMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-21mp3dec: fix seeking without xing TOCMichael Niedermayer
fixes regression from the xing toc support Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-20Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mp3dec: read Xing frame TOC index mp3dec: use named constants for Xing header flags libx264: add support for nal-hrd, required for Blu-ray streams. mov: support random access point grouping matroskadec: properly support BlockDuration Conflicts: libavcodec/libx264.c libavformat/isom.h libavformat/matroskadec.c libavformat/mov.c libavformat/mp3dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-20Merge commit 'c831ebf61629d219ebcaa9f02d262e67aad09d83'Michael Niedermayer
* commit 'c831ebf61629d219ebcaa9f02d262e67aad09d83': matroskadec: split frame parsing matroskadec: split laces parsing Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-20Merge commit '117d8c6d1f1c187ffc6098d9618457e00534e013'Michael Niedermayer
* commit '117d8c6d1f1c187ffc6098d9618457e00534e013': matroska: implement support for ProRes matroska: implement support for ALAC Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-20matroskadec: fix typoMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-20Merge commit '870e75524aa0d00ebcd1d15589c8d29b84af1565'Michael Niedermayer
* commit '870e75524aa0d00ebcd1d15589c8d29b84af1565': matroskadec: validate lace_size when parsed Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-20lavf probe: prevent codec probe with no data at all seenJanne Grunau
This occurs with fuzzed mpeg-ts files. set_codec_from_probe_data() is called with a zeroed AVProbeData since no packet made through for specific stream.
2012-09-20Merge commit 'c9a39cec70603f662f4c326b21b11c4f0112079a'Michael Niedermayer
* commit 'c9a39cec70603f662f4c326b21b11c4f0112079a': matroskadec: return meaningful errors in matroska_decode_buffer matroskadec: fix incorrect unsigned->signed conversion Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-20Merge commit '8d4dd55c37b14ecea596f3477b35bf6c20688d8b'Michael Niedermayer
* commit '8d4dd55c37b14ecea596f3477b35bf6c20688d8b': matroskadec: refactor matroska_decode_buffer Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-20mxfdec: fix index_tables check in mxf_read_seek()Michael Niedermayer
Approved-by: Tjoppen Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-20Merge commit '581281e242609a222233a2e5538b89dfb88fb18e'Michael Niedermayer
* commit '581281e242609a222233a2e5538b89dfb88fb18e': matroskadec: check realloc in lzo encoding matroska: honor error_recognition on unknown doctypes tiffdec: Add support for GRAY16LE. tiffenc: Add support for little endian RGB48 and GRAY16 mpeg4: support frame parameter changes with frame-mt mpegvideo: check ff_find_unused_picture() return value for errors mpegvideo: release frame buffers before freeing them configure: msvc: default to 'lib' as 'ar' tool build: support some non-standard ar variants Conflicts: libavcodec/h263dec.c libavcodec/mpegvideo.c libavcodec/tiff.c libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-20mxfenc: support 23.976 and 24 frame ratesMatthieu Bouron
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-20mxfenc: factorize samples per frame codeMatthieu Bouron
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-20mov: fix 32/64 format typeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-19mp3dec: read Xing frame TOC indexAnton Khirnov
2012-09-19mp3dec: use named constants for Xing header flagsAnton Khirnov
2012-09-19mov: support random access point groupingYusuke Nakamura
Frames described by this grouping are the starter of a closed or an open GOP. This is useful for open GOP of H.264 stream which is not described by sync sample atom. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-09-19matroskadec: split frame parsingLuca Barbato
2012-09-19matroska: implement support for ProResLuca Barbato
Support Matroska native formatting. On demuxing prepend a Frame container atom (32bit big endian encoded frame size and 'icpf' string). On muxing remove it.
2012-09-19matroskadec: validate lace_size when parsedLuca Barbato
Stricter validation, explicitly exit on misparsing and some error forwarding from the ebml parsing functions used.
2012-09-19matroskadec: return meaningful errors in matroska_decode_bufferLuca Barbato
2012-09-19matroskadec: refactor matroska_decode_bufferLuca Barbato
Make MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP behave like the other encodings and spare few lines of boilerplate code.
2012-09-19matroskadec: properly support BlockDurationLuca Barbato
2012-09-19matroskadec: split laces parsingLuca Barbato
2012-09-19matroska: implement support for ALACMoritz Bunkus
Support Matroska native formatting. On demuxing reconstruct the 36-bytes QuickTime atom that the ALAC decoder expects by prepending the "atom size", "tag" and "tag version" fields missing from the Matroska's CodecPrivate element. On muxing remove the initial 12 bytes Sample files are available: http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska.mka and the CoreAudio file it was created from with today's mkvmerge: http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska-source.caf Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-09-19matroskadec: fix incorrect unsigned->signed conversionDale Curtis
2012-09-19matroskadec: check realloc in lzo encodingLuca Barbato
Make all the compression encodings behave the same way.
2012-09-19matroska: honor error_recognition on unknown doctypesLuca Barbato
2012-09-19Merge commit '1b3439b3055b083df51d7f7838ecc6b3f708b15c'Michael Niedermayer
* commit '1b3439b3055b083df51d7f7838ecc6b3f708b15c': mpegvideo: move frame size dependent memory management to separate functions configure: add --toolchain option configure: Make the smoothstreaming muxer enable the ismv muxer smoothstreaming: Export the mp4 codec tags mov: check for EOF in long lasting loops avcodec: cleanup utils.c binkaudio: remove unneeded GET_BITS_SAFE macro binkaudio: use float sample format binkaudio: use a different value for the coefficient scale for the DCT codec Conflicts: configure libavcodec/mpegvideo.c libavcodec/utils.c libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-19avidec: workaround aac with broken block alignMichael Niedermayer
Fixes Ticket1742 Based on patch by: Nikola Vranic <nikola.vranic@rt-rk.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-18smoothstreaming: Export the mp4 codec tagsMartin Storsjö
This fixes stream copy from a format that already has incompatible codec tags set. The chained ismv muxer exports this same codec tag list, so set it on this one as well, to allow the caller (and lavf common code) to set them correctly. Signed-off-by: Martin Storsjö <martin@martin.st>
2012-09-18mov: check for EOF in long lasting loopsLuca Barbato
A quite widespread pattern in the demuxer is read a 32bit unsigned integer and then loop till this value is reached. Checking for EOF prevents pathological situations.
2012-09-18flvenc: silence bogus warningBenjamin Larsson
The compiler fails to figure out that enc->codec_type can only have 3 different values. Thus when an if/else is encountered it triggers on the possibility of the else case has not initialized the flags variable. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-09-18nsvdec: change 2 commented assert() to av_assert()Michael Niedermayer
they keep showing up if i grep for non av assert() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-17Remove code that duplicates existing code a few lines down.Reimar Döffinger
This also fixes a potential crash since s->pb can be NULL. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-09-17id3v2: strdup the genre name explicitly.Clément Bœsch
It would have been done anyway in the av_dict_set() call. This simplifies the code and avoid a warning because of assigning a const string from ff_id3v1_genre_str to a non-const variable. Signed-off-by: Anton Khirnov <anton@khirnov.net>