summaryrefslogtreecommitdiff
path: root/libavformat/asfdec.c
Commit message (Collapse)AuthorAge
* 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>
| * asfdec: silence a warningVladimir Pantelic2013-02-09
| | | | | | | | | | Signed-off-by: Vladimir Pantelic <vladoman@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '48a4ffa722c0874b251de9d201babed52cef0bcb'Michael Niedermayer2013-02-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '48a4ffa722c0874b251de9d201babed52cef0bcb': asf: K&R formatting cosmetics vc1dec: use codec_id instead of codec_tag for VC1IMAGE sh4: drop unused functions Conflicts: libavformat/asf.c libavformat/asfdec.c libavformat/asfenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asf: K&R formatting cosmeticsDiego Biurrun2013-02-06
| |
* | asfdec: fix integer overflow in packet_replic_size checkMichael Niedermayer2013-01-31
| | | | | | | | | | | | | | Fixes assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9a00374cb4512a58a1fee366b850dfa87c76e1f3'Michael Niedermayer2013-01-08
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '9a00374cb4512a58a1fee366b850dfa87c76e1f3': doc: Fix a few typos in the developer documentation xwma: Remove unused variable asfdec: Fix printf format string length modifier Conflicts: doc/developer.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asfdec: Fix printf format string length modifierDiego Biurrun2013-01-07
| |
* | asfdec: check extradata size before alloc and readMichael Niedermayer2012-12-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfdec: check stream_index for validityMichael Niedermayer2012-11-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfdec: flip the interpretation of the header aspect backMichael Niedermayer2012-11-03
| | | | | | | | | | | | | | | | This reverts 2de88776892093b10522152f1f72b7dfc0320502 Fixes Ticket 1883 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfdec: parse aspect ratio payload extensionMichael Niedermayer2012-11-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfdec: correctly parse payload extensionsMichael Niedermayer2012-11-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfdec: parse payload extension listMichael Niedermayer2012-11-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfdec: fixed signedness in comparissionMichael Niedermayer2012-10-25
| | | | | | | | | | Fixes CID739864 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: asfdec: cosmetics, reformat ff_asf_parse_packet() g.723.1: add missing CODEC_CAP_DR1 avconv: remove now unneeded calls to avcodec_get_frame_defaults(). lavc: initialize output AVFrame before decoding. Conflicts: libavformat/asfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asfdec: cosmetics, reformat ff_asf_parse_packet()Anton Khirnov2012-10-24
| |
* | asfdec: ignore stored duration for truncated filesMichael Niedermayer2012-10-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avcodec: Convert some commented-out printf/av_log instances to av_dlog avcodec: Drop silly and/or broken printf debug output avcodec: Drop some silly commented-out av_log() invocations avformat: Convert some commented-out printf/av_log instances to av_dlog avformat: Remove non-compiling and/or silly commented-out printf/av_log statements Remove some silly disabled code. ac3dec: ensure get_buffer() gets a buffer for the correct number of channels Conflicts: libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h264.c libavcodec/h264_parser.c libavcodec/mjpegdec.c libavcodec/motion_est_template.c libavcodec/mpegaudiodec.c libavcodec/mpegvideo_enc.c libavcodec/put_bits.h libavcodec/ratecontrol.c libavcodec/wmaenc.c libavdevice/timefilter.c libavformat/asfdec.c libavformat/avidec.c libavformat/avienc.c libavformat/flvenc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Convert some commented-out printf/av_log instances to av_dlogDiego Biurrun2012-10-01
| |
| * avformat: Remove non-compiling and/or silly commented-out printf/av_log ↵Diego Biurrun2012-10-01
| | | | | | | | statements
* | asfdec: invert SARMichael Niedermayer2012-09-12
| | | | | | | | | | | | It appears this was wrong Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-22 16:53:13 +0000