summaryrefslogtreecommitdiff
path: root/libavformat/flvdec.c
Commit message (Collapse)AuthorAge
* Merge commit '40665d27e38e6a2f65037878202bd1a398c7683e'Michael Niedermayer2014-11-25
|\ | | | | | | | | | | | | | | | | | | * commit '40665d27e38e6a2f65037878202bd1a398c7683e': flvdec: Document how the duration is retrieved at the end of the file Conflicts: libavformat/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: Document how the duration is retrieved at the end of the fileUwe L. Korn2014-11-24
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae'Michael Niedermayer2014-10-21
|\| | | | | | | | | | | | | | | | | | | | | * commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae': flvdec: make sure to check create_stream and report the same error Conflicts: libavformat/flvdec.c See: d7d5b5dfc1b6f29646d2c1908c9bac8677f34256 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: make sure to check create_stream and report the same errorVittorio Giovara2014-10-21
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732242
* | Merge commit 'f22aa6b841dc54fa1dd804303885b1e230a5f629'Michael Niedermayer2014-10-21
|\| | | | | | | | | | | | | | | * commit 'f22aa6b841dc54fa1dd804303885b1e230a5f629': flvdec: avoid unitialized use of a struct member See: 396ddcf22d55fa7e735d69eed22a4a4b1649b73c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: avoid unitialized use of a struct memberVittorio Giovara2014-10-21
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 718141
* | avformat/flvdec: read the correct bits into the tag typeSteven Liu2014-09-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the flv spec, the flvtag define the tagtype as one byte, the spec desc is: Reserved UB[2] Reserved for FMS, should be 0 Filter UB[1] Indicates if packets are filtered. 0 = No pre-processing required. 1 = Pre-processing (such as decryption) of the packet is required before it can be rendered. Shall be 0 in unencrypted files, and 1 for encrypted tags. See Annex F. FLV Encryption for the use of filters. TagType UB[5] Type of contents in this tag. The following types are defined: 8 = audio 9 = video 18 = script data Signed-off-by: Steven Liu <qi.liu@chinacache.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0f789322efa78a672e4c3027e5cc12b8a947043a'Michael Niedermayer2014-08-13
|\| | | | | | | | | | | | | * commit '0f789322efa78a672e4c3027e5cc12b8a947043a': flvdec: update AVFormatContext.event_flags with METADATA_UPDATED whenever metadata changes. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: update AVFormatContext.event_flags with METADATA_UPDATED whenever ↵Andrew Stone2014-08-13
| | | | | | | | | | | | metadata changes. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '93c04e095dc37ebdab22174e88cfa91e24940866'Michael Niedermayer2014-08-13
|\| | | | | | | | | | | | | * commit '93c04e095dc37ebdab22174e88cfa91e24940866': Expose metadata found in onCuePoint events in .flv files. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Expose metadata found in onCuePoint events in .flv files.Andrew Stone2014-08-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, only onMetaData is used, but some providers (wrongly) put metadata into onCuePoint events, and it's still nice to be able to use that data. onCuePoint events also present metadata slightly differently than onMetaData events: all metadata is found inside an object called "parameters". In order to extract this metadata, it's easiest to recurse through the object tree and pull out anything found in child objects and put it in the top-level metadata. Reference: http://help.adobe.com/en_US/FlashPlatform/reference/actionscript/2/help.html?content=00001404.html Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | 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>
* | Merge commit 'fa14804c83a7108a50c63d1f2180e30c75909529'Michael Niedermayer2014-08-01
|\| | | | | | | | | | | | | | | | | | | * commit 'fa14804c83a7108a50c63d1f2180e30c75909529': flv: Index the audio stream Conflicts: libavformat/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: Index the audio streamLuca Barbato2014-08-01
| | | | | | | | | | And leverage the video index if the video is just disabled as wm4 did in an initial patch.
* | avformat/flvdec: use AV_PKT_DATA_NEW_EXTRADATA for h264 tooMichael Niedermayer2014-07-23
| | | | | | | | | | | | Fixes Ticket 3787 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: give live_flvdec a separate nameMichael Niedermayer2014-06-21
| | | | | | | | | | | | This should fix a infinite loop on freebsd Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: Support live flv / NGINX RTMP streamsMichael Niedermayer2014-06-16
| | | | | | | | | | | | Fixes Ticket3553 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a1859032e39d96352687186fd179e1559dea2aca'Michael Niedermayer2014-06-01
|\| | | | | | | | | | | | | * commit 'a1859032e39d96352687186fd179e1559dea2aca': flvdec: Do not default to a video and audio stream Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: Do not default to a video and audio streamUwe L. Korn2014-06-01
| | | | | | | | | | | | | | | | | | If no streams were indicated in the FLV header, do not automatically allocate by default a video and an audio stream. Instead, in the case that the header did not indicate the presence of any data, allocate no stream until data actually arrives for one type. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Fix skiping typosMichael Niedermayer2014-04-27
| | | | | | | | | | Found-by: Alessandro Ghedini <alessandro@ghedini.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '152b797cd687e96a582a1cb908dddf3d330d7637'Michael Niedermayer2014-04-24
|\| | | | | | | | | | | | | * commit '152b797cd687e96a582a1cb908dddf3d330d7637': flv: Do not mangle dts values for negative cts Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: Do not mangle dts values for negative ctsLuca Barbato2014-04-23
| | | | | | | | Some applications really mean to send negative pts.
* | Merge commit '5d983fdbca5570a1545a892583a372cfb3fffe92'Michael Niedermayer2014-04-24
|\| | | | | | | | | | | | | * commit '5d983fdbca5570a1545a892583a372cfb3fffe92': flv: Warn only once Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: Warn only onceLuca Barbato2014-04-23
| | | | | | | | No point in sending the message multiple time.
* | Merge commit '374fdc8c071dcd96422378b0a1a0d453336d8a01'Michael Niedermayer2014-04-24
|\| | | | | | | | | | | | | | | | | | | * commit '374fdc8c071dcd96422378b0a1a0d453336d8a01': flv: Improve log messages Conflicts: libavformat/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: Improve log messagesLuca Barbato2014-04-23
| | | | | | | | | | Messages should start with a capital letter and possibly end with a "." if they are statements.
* | avformat/flvdec: also include file position in debug outputMichael Niedermayer2014-04-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: discard inconsistent timestampsMichael Niedermayer2014-03-12
| | | | | | | | | | | | Fixes Ticket3425 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-11
|\| | | | | | | | | | | | | | | | | | | * qatar/master: flv: Workaround for buggy Omnia A/XE encoder Conflicts: libavformat/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: Workaround for buggy Omnia A/XE encoderBenjamin Larsson2014-01-11
| | | | | | | | | | | | | | | | | | The Omnia A/XE encoder writes the explicit extra data incorrectly and wrongly disables parametric stereo. Truncating the extra data by setting the size to 2 works around this. The AAC extra data parser will then only parse the correct parts. Bug-id: 599
* | avformat/flvdec: initialize context before reading from itMichael Niedermayer2014-01-10
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f9b8387069e_5377_flv_with_pcm_s16be_audio_track.flv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: use ff_get_extradata()Michael Niedermayer2013-12-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Enable parser in FLV demuxer for H264 codecAlex Sukhanov2013-12-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: use avpriv_request_sample()Paul B Mahol2013-10-18
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat: use ff_alloc_extradata()Paul B Mahol2013-10-13
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'c951e4b442df9dde6051634a85359eb809bf2142'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | * commit 'c951e4b442df9dde6051634a85359eb809bf2142': flv: Make onTextData parsing robust Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: Make onTextData parsing robustLuca Barbato2013-09-22
| | | | | | | | Certain streaming servers do not preserve the order of the fields.
* | Merge commit '0a9425d7cfdf0113c3d32096c9406823efe0cd0a'Michael Niedermayer2013-09-17
|\| | | | | | | | | | | | | * commit '0a9425d7cfdf0113c3d32096c9406823efe0cd0a': flv: Do not export datastream as metadata Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: Do not export datastream as metadataLuca Barbato2013-09-16
| | | | | | | | It is used internally.
* | Merge commit 'f4634ae8a83d13a1abf3baac8956a3111aa09ed2'Michael Niedermayer2013-08-28
|\| | | | | | | | | | | | | * commit 'f4634ae8a83d13a1abf3baac8956a3111aa09ed2': flv: Fix the help string Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: Fix the help stringLuca Barbato2013-08-27
| |
* | flvdec: silence unused warningMichael Niedermayer2013-08-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f900f35ac8db4ac30df6fda1c27502c2ef9e6ba5'Michael Niedermayer2013-08-02
|\| | | | | | | | | | | | | * commit 'f900f35ac8db4ac30df6fda1c27502c2ef9e6ba5': flvdec: Eliminate completely silly goto Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: Eliminate completely silly gotoDiego Biurrun2013-08-01
| |
* | Merge commit 'e4529df944616917ae8462f5102253ff7f983093'Michael Niedermayer2013-08-02
|\| | | | | | | | | | | | | | | | | | | * commit 'e4529df944616917ae8462f5102253ff7f983093': flvdec: K&R formatting cosmetics Conflicts: libavformat/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: K&R formatting cosmeticsDiego Biurrun2013-08-01
| |
* | Merge commit '390b4d7088b5cecace245fee0c54a57e24dabdf4'Michael Niedermayer2013-08-02
|\| | | | | | | | | | | | | * commit '390b4d7088b5cecace245fee0c54a57e24dabdf4': flvdec: Fix = vs. == typo in sample rate check Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: Fix = vs. == typo in sample rate checkDiego Biurrun2013-08-01
| |
| * Remove unreachable returnsDiego Biurrun2013-07-27
| |
* | Rename "AVClass class" as "AVClass component_class".Carl Eugen Hoyos2013-06-30
| | | | | | | | The aix header math.h defines "extern int class()" for C.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 05:21:29 +0000