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

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-01-17avformat/asfdec: Check the av_get_packet() return valueMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-18wavdec: RIFX file format supportThomas Volkert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-20avformat/asfdec: Check av_new_packet()s return codeMichael Niedermayer
Fixes CID1041093 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08replace calls to url_feof() with avio_feof()James Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-14avformat/asfdec: Try to improve skip caseMichael Niedermayer
Fixes Ticket3761 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-13avformat/asfdec: dvrms timestamps are pts not dtsMichael Niedermayer
Should fix Ticket3328 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-21Show duration for large asf files as written in the file header.Carl Eugen Hoyos
Fixes ticket #3428.
2014-06-03avformat/asfdec: Use a parser for mpeg4-asp to find has_b_framesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19ff_id3v2_read: add option to limit ID3 magic number searchPeter Ross
Several chunked formats (AIFF, IFF,DSF) store ID3 metadata within an 'ID3 ' chunk tag. If such chunks are stored sequentially, it is possible for the ID3v2 parser to confuse the chunk tag for the ID3 magic number. e.g. [1st chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...] [2nd chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...] Fixes ticket #3530. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'Michael Niedermayer
* commit 'd92024f18fa3d69937cb2575f3a8bf973df02430': lavf: more correct printf format specifiers Conflicts: libavformat/asfdec.c libavformat/cafdec.c libavformat/dxa.c libavformat/framecrcenc.c libavformat/hnm.c libavformat/iff.c libavformat/mov.c libavformat/mxfdec.c libavformat/rmdec.c libavformat/rpl.c libavformat/smacker.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11lavf: more correct printf format specifiersDiego Biurrun
2014-02-12avformat/asfdec: pass on error code from avio_seek()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-12Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: asfdec: fix seeking with fragmented packets Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-12Merge commit '0c082565965258dca143767cc6cb25e38b6e9ea3'Michael Niedermayer
* commit '0c082565965258dca143767cc6cb25e38b6e9ea3': asfdec: short-circuit seeking to the start of stream Conflicts: libavformat/asfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-12Merge commit '0ebb523f072322972ea446616676fff32e9603c6'Michael Niedermayer
* commit '0ebb523f072322972ea446616676fff32e9603c6': asfdec: check ff_get_guid() return values during seeking Conflicts: libavformat/asfdec.c The code that pretends that a truncated index is correct and complete is not merged as it obviously would cause problems if a really truncated index is encountered If someone has samples that work better with that hack, please share them / mail me also the bug this apparently attempts to fix isnt reproducable before this in ffmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-12asfdec: fix seeking with fragmented packetsJanne Grunau
After seeking fragments with an offset > 0 must be skipped to correctly assemble packets. Bug-Id: 43
2014-02-12asfdec: short-circuit seeking to the start of streamAndrew Kelley
Bug-id: 43 Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2014-02-12asfdec: check ff_get_guid() return values during seekingJanne Grunau
Hitting EOF during seeking is quite likely. Fixes use of uninitialized data during fate-seek-lavf-asf.
2013-12-14avformat/asf: clear uninitialized areas of packets before returning themMichael Niedermayer
Fixes use of uninitialized variables Fixes msan_uninit-mem_7f839282b6ce_7273_msn08_VBRq70_800x600.wmv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24avformat/asfdec: ignore packet_segmentsMichael Niedermayer
Fixes Ticket1708 Based on patch by Alberto Delmás Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24avformat/asfdec: reset packet_time_start when asf_read_frame_header() failedAlberto Delmás
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24avformat/asfdec: remove duplicated packet_segments resetMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-02Merge commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad'Michael Niedermayer
* commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad': asfdec: Check the return value of asf_read_stream_properties Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-30asfdec: Check the return value of asf_read_stream_propertiesMartin Storsjö
This makes sure errors in setting stream parameters are passed on to the caller. This avoids successfully opening files while some parameters aren't filled in properly. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-20Merge commit '5f408333601a827054335f309defcb246a532b21'Michael Niedermayer
* commit '5f408333601a827054335f309defcb246a532b21': asfdec: substract preroll time from marker presentation time Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-19asfdec: substract preroll time from marker presentation timeVladimir Pantelic
this was forgotten when we changed ASF to not output the preroll time Signed-off-by: Vladimir Pantelic <vladoman@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-09-09avcodec/asfdec: check return value of av_mallocz()Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-13avformat/asfdec: call ff_read_frame_flush() in asf_read_pts()Michael Niedermayer
flushing just the asf demuxer but not the cores buffers leads to inconsistencies and a "random" packet position which later causes an assertion failure Fixes Ticket2853 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'Michael Niedermayer
* commit '7950e519bb094897f957b9a9531cc60ba46cbc91': Disable deprecation warnings for cases where a replacement is available Conflicts: libavcodec/avpacket.c libavcodec/pthread.c libavcodec/utils.c libavdevice/v4l2.c libavfilter/avfiltergraph.c libavfilter/buffersrc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-02Disable deprecation warnings for cases where a replacement is availableDiego Biurrun
2013-07-30asfdec: Skip to keyframe after seekingMichael Niedermayer
Fixes Ticket1616 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-30asfdec: remove "ignoring invalid packet_obj_size" codeMichael Niedermayer
The code is no longer needed Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-30asfdec: move packet_obj_size to ASFStreamMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-30asfdec: avoid using AVStream->priv_dataMichael Niedermayer
This ensures that we dont write into one struct and read the other without realizing that they arent identical. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'Michael Niedermayer
* commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110': vf_aspect: use the name 's' for the pointer to the private context Remove commented-out debug #define cruft Conflicts: libavcodec/4xm.c libavcodec/dvdsubdec.c libavcodec/ituh263dec.c libavcodec/mpeg12.c libavfilter/avfilter.c libavfilter/vf_aspect.c libavfilter/vf_fieldorder.c libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16Remove commented-out debug #define cruftDiego Biurrun
2013-05-01Merge commit 'e926b5ceb1962833f0c884a328382bc2eca67aff'Michael Niedermayer
* commit 'e926b5ceb1962833f0c884a328382bc2eca67aff': avformat: Drop unnecessary ff_ name prefixes from static functions Conflicts: libavformat/audiointerleave.c libavformat/mux.c libavformat/mxfenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30avformat: Drop unnecessary ff_ name prefixes from static functionsDiego Biurrun
2013-04-21riff: Move guid structs and helper functions into riffPeter Ross
Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-03-08Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'Michael Niedermayer
* commit '1afddbe59e96af75f1c07605afc95615569f388f': avpacket: use AVBuffer to allow refcounting the packets. Conflicts: libavcodec/avpacket.c libavcodec/utils.c libavdevice/v4l2.c libavformat/avidec.c libavformat/flacdec.c libavformat/id3v2.c libavformat/matroskaenc.c libavformat/mux.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08avpacket: use AVBuffer to allow refcounting the packets.Anton Khirnov
This will allow us to avoid copying the packets in many cases. This breaks ABI.
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-02Avoid huge memory allocations from asf demuxer.Carl Eugen Hoyos
Fixes ticket #1888.
2013-02-10Merge commit '81726a4f0b8a43e19898e2a36fdde80583bafff0'Michael Niedermayer
* commit '81726a4f0b8a43e19898e2a36fdde80583bafff0': FATE: add tests for additional flavors of asf cover art asfdec: do not assume every AVStream has a corresponding ASFStream Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10Merge commit 'f5fac6f77752931347ab302563802dcaa49c2419'Michael Niedermayer
* commit 'f5fac6f77752931347ab302563802dcaa49c2419': asfdec: support reading ID3v2 tags in ASF files Conflicts: Changelog libavformat/asfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10Merge commit '84b721db366c0734fdfd23c8daaa7da7da21f761'Michael Niedermayer
* commit '84b721db366c0734fdfd23c8daaa7da7da21f761': asfdec: also read Metadata Library Object Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10Merge commit '61f9ad2dfcb3f98b7ac5777d19d0e7b61d0be01e'Michael Niedermayer
* commit '61f9ad2dfcb3f98b7ac5777d19d0e7b61d0be01e': asfdec: read the full Metadata Object, not just aspect ratio information Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10Merge commit '36fab50e90d15352e403e4cc210890810f2fb4e2'Michael Niedermayer
* commit '36fab50e90d15352e403e4cc210890810f2fb4e2': asfdec: silence a warning mss4, ra288: Remove unused DSPContext local codec context members Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09asfdec: support reading ID3v2 tags in ASF filesVladimir Pantelic
Yes, these files do exist Signed-off-by: Vladimir Pantelic <vladoman@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-02-09asfdec: also read Metadata Library ObjectVladimir Pantelic
In some ASF files this objects holds cover art and other tags. Compared to Metadata Object it can also hold GUIDs, but we ignore these for now. Signed-off-by: Vladimir Pantelic <vladoman@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>