summaryrefslogtreecommitdiff
path: root/libavformat/asfdec.c
Commit message (Collapse)AuthorAge
* avformat/asfdec: Check av_new_packet()s return codeMichael Niedermayer2014-08-20
| | | | | | Fixes CID1041093 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* replace calls to url_feof() with avio_feof()James Almer2014-08-08
| | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/asfdec: Try to improve skip caseMichael Niedermayer2014-07-14
| | | | | | Fixes Ticket3761 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/asfdec: dvrms timestamps are pts not dtsMichael Niedermayer2014-07-13
| | | | | | Should fix Ticket3328 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Show duration for large asf files as written in the file header.Carl Eugen Hoyos2014-06-21
| | | | Fixes ticket #3428.
* avformat/asfdec: Use a parser for mpeg4-asp to find has_b_framesMichael Niedermayer2014-06-03
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ff_id3v2_read: add option to limit ID3 magic number searchPeter Ross2014-04-19
| | | | | | | | | | | | | | 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>
* Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'Michael Niedermayer2014-03-11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavf: more correct printf format specifiersDiego Biurrun2014-03-11
| |
* | avformat/asfdec: pass on error code from avio_seek()Michael Niedermayer2014-02-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-12
|\| | | | | | | | | | | | | * qatar/master: asfdec: fix seeking with fragmented packets Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asfdec: fix seeking with fragmented packetsJanne Grunau2014-02-12
| | | | | | | | | | | | | | After seeking fragments with an offset > 0 must be skipped to correctly assemble packets. Bug-Id: 43
* | Merge commit '0c082565965258dca143767cc6cb25e38b6e9ea3'Michael Niedermayer2014-02-12
|\| | | | | | | | | | | | | | | | | | | * commit '0c082565965258dca143767cc6cb25e38b6e9ea3': asfdec: short-circuit seeking to the start of stream Conflicts: libavformat/asfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asfdec: short-circuit seeking to the start of streamAndrew Kelley2014-02-12
| | | | | | | | | | | | Bug-id: 43 Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | Merge commit '0ebb523f072322972ea446616676fff32e9603c6'Michael Niedermayer2014-02-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * asfdec: check ff_get_guid() return values during seekingJanne Grunau2014-02-12
| | | | | | | | | | Hitting EOF during seeking is quite likely. Fixes use of uninitialized data during fate-seek-lavf-asf.
* | avformat/asf: clear uninitialized areas of packets before returning themMichael Niedermayer2013-12-13
| | | | | | | | | | | | | | 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>
* | avformat/asfdec: ignore packet_segmentsMichael Niedermayer2013-11-24
| | | | | | | | | | | | | | Fixes Ticket1708 Based on patch by Alberto Delmás Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec: reset packet_time_start when asf_read_frame_header() failedAlberto Delmás2013-11-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec: remove duplicated packet_segments resetMichael Niedermayer2013-11-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad'Michael Niedermayer2013-10-02
|\| | | | | | | | | | | | | * commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad': asfdec: Check the return value of asf_read_stream_properties Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asfdec: Check the return value of asf_read_stream_propertiesMartin Storsjö2013-09-30
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit '5f408333601a827054335f309defcb246a532b21'Michael Niedermayer2013-09-20
|\| | | | | | | | | | | | | * commit '5f408333601a827054335f309defcb246a532b21': asfdec: substract preroll time from marker presentation time Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asfdec: substract preroll time from marker presentation timeVladimir Pantelic2013-09-19
| | | | | | | | | | | | | | 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>
* | avcodec/asfdec: check return value of av_mallocz()Paul B Mahol2013-09-09
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/asfdec: call ff_read_frame_flush() in asf_read_pts()Michael Niedermayer2013-08-12
| | | | | | | | | | | | | | | | | | 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>
* | Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'Michael Niedermayer2013-08-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Disable deprecation warnings for cases where a replacement is availableDiego Biurrun2013-08-02
| |
* | asfdec: Skip to keyframe after seekingMichael Niedermayer2013-07-30
| | | | | | | | | | | | Fixes Ticket1616 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfdec: remove "ignoring invalid packet_obj_size" codeMichael Niedermayer2013-07-30
| | | | | | | | | | | | The code is no longer needed Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfdec: move packet_obj_size to ASFStreamMichael Niedermayer2013-07-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfdec: avoid using AVStream->priv_dataMichael Niedermayer2013-07-30
| | | | | | | | | | | | | | 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>
* | Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'Michael Niedermayer2013-05-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Remove commented-out debug #define cruftDiego Biurrun2013-05-16
| |
* | Merge commit 'e926b5ceb1962833f0c884a328382bc2eca67aff'Michael Niedermayer2013-05-01
|\| | | | | | | | | | | | | | | | | | | | | | | * 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>
| * avformat: Drop unnecessary ff_ name prefixes from static functionsDiego Biurrun2013-04-30
| |
| * riff: Move guid structs and helper functions into riffPeter Ross2013-04-21
| | | | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * avpacket: use AVBuffer to allow refcounting the packets.Anton Khirnov2013-03-08
| | | | | | | | | | | | This will allow us to avoid copying the packets in many cases. This breaks ABI.
* | asfdec: dont truncate type 2-5 valuesMichael Niedermayer2013-03-05
| | | | | | | | | | | | | | 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>
* | Avoid huge memory allocations from asf demuxer.Carl Eugen Hoyos2013-03-02
| | | | | | | | Fixes ticket #1888.
* | Merge commit '81726a4f0b8a43e19898e2a36fdde80583bafff0'Michael Niedermayer2013-02-10
|\| | | | | | | | | | | | | | | * 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>
| * asfdec: do not assume every AVStream has a corresponding ASFStreamAnton Khirnov2013-02-09
| | | | | | | | | | | | | | This won't be true for ID3 attached picture. Also stop allocating now useless dummy ASFStreams for ASF native attached pictures.
* | Merge commit 'f5fac6f77752931347ab302563802dcaa49c2419'Michael Niedermayer2013-02-10
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f5fac6f77752931347ab302563802dcaa49c2419': asfdec: support reading ID3v2 tags in ASF files Conflicts: Changelog libavformat/asfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asfdec: support reading ID3v2 tags in ASF filesVladimir Pantelic2013-02-09
| | | | | | | | | | | | | | Yes, these files do exist Signed-off-by: Vladimir Pantelic <vladoman@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '84b721db366c0734fdfd23c8daaa7da7da21f761'Michael Niedermayer2013-02-10
|\| | | | | | | | | | | | | * commit '84b721db366c0734fdfd23c8daaa7da7da21f761': asfdec: also read Metadata Library Object Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asfdec: also read Metadata Library ObjectVladimir Pantelic2013-02-09
| | | | | | | | | | | | | | | | 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>
* | Merge commit '61f9ad2dfcb3f98b7ac5777d19d0e7b61d0be01e'Michael Niedermayer2013-02-10
|\| | | | | | | | | | | | | * commit '61f9ad2dfcb3f98b7ac5777d19d0e7b61d0be01e': asfdec: read the full Metadata Object, not just aspect ratio information Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asfdec: read the full Metadata Object, not just aspect ratio informationVladimir Pantelic2013-02-09
| | | | | | | | | | | | | | | | Use the same get_tag()/get_value() as for the Extended Content Description but handle the 16 bit vs 32 bit difference for type 2 (BOOL) Signed-off-by: Vladimir Pantelic <vladoman@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '36fab50e90d15352e403e4cc210890810f2fb4e2'Michael Niedermayer2013-02-10
|\| | | | | | | | | | | | | | | * commit '36fab50e90d15352e403e4cc210890810f2fb4e2': asfdec: silence a warning mss4, ra288: Remove unused DSPContext local codec context members Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-12 10:59:27 +0000