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-07-26avformat/dtsdec: Improve probe, reject things looking like analog signalsMichael Niedermayer
Fixes Ticket2810 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6663205338f57eedb2392263dde48e2717c6e980) Conflicts: libavformat/dtsdec.c
2013-07-16avformat/matroskadec: Detect conflicting sample rate/default_durationMichael Niedermayer
Fixes Ticket2508 Thanks-to: Moritz Bunkus Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6158a3bcdf52fafc1d9ae9eb358a56c614b23aa3)
2013-07-15Merge remote-tracking branch 'jamrial/release/1.2' into release/1.2Michael Niedermayer
* jamrial/release/1.2: oggparseskeleton: avoid header parsing failure oggparseskeleton: Replace avpriv_report_missing_feature() with a normal av_log() call oggparseskeleton: Fix fisbone header parsing Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10avformat/utils: Keep internal and external av_read_frame() packets in sync.Dale Curtis
Otherwise, during error conditions, the caller will be left with dangling pointers to a destructed packet => boom. BUG=242786 TEST=ffmpeg_regression_tests Commit slightly simplified by commiter Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c54a1565f512858ccfa70392f40f11c098bc1b63) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09mp3dec: detect CBR and use CBR axiom to seekMichael Niedermayer
This should also work reasonable with truncated and growing mp3s. Fixes Ticket2590 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e096283ea55bc36a637b47329e19ddb26fb1440b) Conflicts: libavformat/mp3dec.c
2013-07-08oggparseskeleton: avoid header parsing failureMichael Niedermayer
Based on description by James Almer and the xiph wiki Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 9a6e814be7c052deb34a8f585176d053f4c187c1)
2013-07-08oggparseskeleton: Replace avpriv_report_missing_feature() with a normal ↵James Almer
av_log() call since there should not be more than one fisbone for a given stream. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 63d7684fefcfa9de1a04b43471f876e882ba7aac) Conflicts: libavformat/oggparseskeleton.c
2013-07-08oggparseskeleton: Fix fisbone header parsingJames Almer
start_granule should be applied to the stream referenced in the fisbone packet, not to the Skeleton stream. This was broken in d1f05dd18375f2f8e68372edee11436927e43ba8 and produced bogus warnings about multiple fisbone in the same stream on files with more than one stream. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3960992f0abf8e28acada220c79fb754d67298ba)
2013-07-07mmsh: dont close context on seeking failureMichael Niedermayer
Fixes Ticket2581 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b4579a29c75e2968ede2ad002dd4a495dbfc883d)
2013-07-07avformat/mov: Fix duration of fragmented movMichael Niedermayer
Fixes Ticket2757 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit dc2a13aa802fc691c25d5e0194818831058316ee)
2013-07-07mpegts: only reopen pmt_cb filter if its different from the previous.Michael Niedermayer
Fixes Ticket2632 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b009267910df10c004b5f340a090d45da29089a0)
2013-07-07rmdec: Pass AVIOContext to rm_read_metadata()Michael Niedermayer
Fix null pointer dereference Fixes Ticket2588 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit bf87908cd8da31e8f8fe75c06577170928ea70a8)
2013-06-27Fix copying extradata to codec in mxfdec.cNigel Touati-Evans
The code that copies any extradata from the MXFDescriptor to the codec does not set the size, which it should otherwise the copied data is useless. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 42bd0cd21ae68abef4436cc97d67f592be38d3e3) Conflicts: libavformat/mxfdec.c
2013-06-21avformat/iff: Byte seek is unsupportedMichael Niedermayer
Fixes Ticket2194 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 03cd3bec6e66a49bcec138d72bac97cb8a64d246)
2013-06-21avformat/libmodplug: Reduce the probe score for small inputMichael Niedermayer
This ensures that theres enough data for mpeg_probe() to recognize mpeg-ps Fixes Ticket2583 Based on code by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c605adbf562fbf535e83ae427bb681bc45e440c8)
2013-06-20Autodetect idcin only if audio properties allow decoding.Carl Eugen Hoyos
Fixes ticket #2688. (cherry picked from commit 06bede95fcea47d2e51e8ff248c15311f335b898)
2013-06-19ff_gen_search: fix infinite loopMichael Niedermayer
Fixes Ticket2639 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f8ca8138f01d0a7d96d4e1ea65fecd1197f96206)
2013-06-19ff_gen_search: fix limitMichael Niedermayer
The limit value could become slightly wrong in the last iteration Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b3dd50cd0dbbda08610b75384128f5f47f5199d9)
2013-06-19ff_gen_search: make step 64 bit to prevent hypothetical integer overflowMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 9d73e302537144877ca9d5b648b21aca28b78f4f)
2013-05-28avienc: Disallow the first frame to be skipedMichael Niedermayer
Fixes Ticket2386 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cc0db8cf3042186d8355dcf10be67071cfbbcc5d)
2013-05-18avidec: dont randomly skip packets for offseting the indexMichael Niedermayer
Fixes Ticket2490 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6c593f1b671b7725b8c36f92f7c0a23ccf8e7628)
2013-05-13Do not read strd chunk in avi files as H264 extradata.Carl Eugen Hoyos
Fixes ticket #2561. (cherry picked from commit 231b3317184790b6be4b4619d96fd328f13aeabb)
2013-05-09Fix heap-buffer-overflow in matroska_parse_blockDale Curtis
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 81e85bc95cb1e4f8cc7b1ba71ec027c8791b55d1) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-09rmdec: flush audio packet on seekingMichael Niedermayer
Fixes Ticket1605 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 519ebb5ee5b89b8ecc80b4a4540fcbeb65cda172) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-09matroska: set "done" only during resync fail.Reimar Döffinger
Fixes playback of test7.mkv validation test file. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> (cherry picked from commit 762d4335aec2e5299a06bfbce15d21336af19464)
2013-04-04Skip padding in an id3 tag in aiff files.Carl Eugen Hoyos
Fixes ticket #2430. Reviewed-by: Matthieu Bouron (cherry picked from commit db2d3a90825025b2f5da85792e1df33280c61391)
2013-04-03smacker: fix off by one errorPaul B Mahol
Regression since a93b572ae4f517ce0c35cf085167c318e9215908. Fixes #2426. Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit e3cc92a623a6ece42816c7a692c8815688a99ab0)
2013-04-02Write broken aac frames to mov files instead of skipping them.Carl Eugen Hoyos
Fixes decoding with picky media players. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b448c0a68d0cc7dfef736267dfdaed0e213c020b)
2013-03-27Only test the first frame for missing aac_adtstoasc bistream filter.Carl Eugen Hoyos
Many players ignore broken aac frames, so don't abort mov or flv muxing when encountering one, just print a warning instead. Fixes ticket #2380. (cherry picked from commit 1741fece7073f51efdd837a4f307ea2cdf3d1cfb)
2013-03-10mpegts: clear avprograms only for removed programsMichael Niedermayer
Fixes Ticket2186 Requested-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 806a66fd08a395486e763fb10588c5fd02e8d54e)
2013-03-07avformat: Fix apics with aacMichael Niedermayer
Fixes Ticket2318 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-07hls: fix timebaseMichael Niedermayer
Fixes Ticket1733 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-07lavf/segment: add support to ffconcat segment listStefano Sabatini
2013-03-06asfdec: dont truncate type 2-5 valuesMichael Niedermayer
Fixes use of uninitialized variables and possible out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-05lavf/concat: compute duration if possible.Nicolas George
2013-03-05Revert "lavf/concatdec: define "ffcat" and "ffconcat" extensions"Nicolas George
This reverts commit 6cc12353a88dfb21c4c5a38e6c83280483b0ec88. Conflicts: libavformat/version.h Allowing to automatically select the concat demuxer raises security concerns, as it allows a possibly hostile file to access any file on the system. Guessing the format based on the file name extension does not allow to enable the safe mode designed to avoid it.
2013-03-05mp3dec: Fix VBR bit rate parsingAlexander Kojevnikov
When parsing the Xing/Info tag, don't set the bit rate if it's an Info tag. When parsing the stream, don't override the bit rate if it's already set, otherwise calculate the mean bit rate from parsed frames. This way, the bit rate will be set correctly both for CBR and VBR streams. Signed-off-by: Alexander Kojevnikov <alexander@kojevnikov.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-05iff: fix integer overflowMichael Niedermayer
Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-04update_stream_timings: check bitrate for being in range.Michael Niedermayer
Fixes numerical overflow Fixes Ticket2089 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-04avformat: Make duration estimation from pts more robustMichael Niedermayer
Ignore durations which differ significantly from the previous Fixes Ticket2018 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-04nutdec: more specific return codes for decode_syncpoint()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-04nutdec: print error on invalid/unsupported fourcc styleMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-04Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer
* cehoyos/master: buildsys: only include log2_tab per library for shared builds Add h264chroma dependency for cavs decoder to configure. Add h264qpel dependency for snow codec to configure. Add h264chroma dependency for vp5 and vp6 decoder to configure. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-04buildsys: only include log2_tab per library for shared buildsMichael Niedermayer
Fix linking failures with -all_load due to multiple log2_tabs Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2013-03-04Remove incorrect use of ctype.h functions.Reimar Döffinger
As far as I can tell the code should not change behaviour depending on locale in any of these places. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-03-03avformat: gather aspect ratio from rv30/40 in find_stream_infoMichael Niedermayer
Fixes Ticket1550 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-03Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer
* cehoyos/master: movenc: Do not flag secondary audio and subtitle tracks as enabled. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-03movenc: Do not flag secondary audio and subtitle tracks as enabled.Michael Niedermayer
Fixes ticket #468 and ticket #1174. Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2013-03-03Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: rtpdec: Initialize some variables to silence compiler warnings Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-02rtpdec: Initialize some variables to silence compiler warningsMartin Storsjö
The warnings are false positives, older gcc versions (such as 4.5) think the variables can be used uninitialized while they in practice can't, while newer (4.6) gets it right. Signed-off-by: Martin Storsjö <martin@martin.st>