summaryrefslogtreecommitdiff
path: root/libavformat/flvdec.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer2015-07-271-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '059a934806d61f7af9ab3fd9f74994b838ea5eba': lavc: Consistently prefix input buffer defines Conflicts: doc/examples/decoding_encoding.c libavcodec/4xm.c libavcodec/aac_adtstoasc_bsf.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.h libavcodec/asvenc.c libavcodec/avcodec.h libavcodec/avpacket.c libavcodec/dvdec.c libavcodec/ffv1enc.c libavcodec/g2meet.c libavcodec/gif.c libavcodec/h264.c libavcodec/h264_mp4toannexb_bsf.c libavcodec/huffyuvdec.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libxvid.c libavcodec/mdec.c libavcodec/motionpixels.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/noise_bsf.c libavcodec/nuv.c libavcodec/nvenc.c libavcodec/options.c libavcodec/parser.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/qsvdec.c libavcodec/svq1enc.c libavcodec/tiffenc.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/vc1dec.c libavcodec/wmalosslessdec.c libavformat/adxdec.c libavformat/aiffdec.c libavformat/apc.c libavformat/apetag.c libavformat/avidec.c libavformat/bink.c libavformat/cafdec.c libavformat/flvdec.c libavformat/id3v2.c libavformat/isom.c libavformat/matroskadec.c libavformat/mov.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpegts.c libavformat/mvi.c libavformat/mxfdec.c libavformat/mxg.c libavformat/nutdec.c libavformat/oggdec.c libavformat/oggparsecelt.c libavformat/oggparseflac.c libavformat/oggparseopus.c libavformat/oggparsespeex.c libavformat/omadec.c libavformat/rawdec.c libavformat/riffdec.c libavformat/rl2.c libavformat/rmdec.c libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_qdm2.c libavformat/rtpdec_svq3.c libavformat/sierravmd.c libavformat/smacker.c libavformat/smush.c libavformat/spdifenc.c libavformat/takdec.c libavformat/tta.c libavformat/utils.c libavformat/vqf.c libavformat/westwood_vqa.c libavformat/xmv.c libavformat/xwma.c libavformat/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: Consistently prefix input buffer definesVittorio Giovara2015-07-271-2/+2
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91'Michael Niedermayer2015-06-121-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91': flv: Name an enum and use its type Conflicts: libavformat/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: Name an enum and use its typeVittorio Giovara2015-06-121-1/+2
| |
* | libavformat/flvdec.c: don't build index_entries for input stream if ↵Igor Derzhavin2015-06-101-2/+3
| | | | | | | | | | | | | | AVIOContext is not seekable Signed-off-by: Igor Derzhavin <igor.derzhavin@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | flvdec: fix lack of duration for some filesGanesh Ajjanagadde2015-06-051-1/+1
| | | | | | | | | | | | | | Fixes #4579 Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: Show unknown tags at debug levelMichael Niedermayer2015-06-051-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: Add TYPE_ONCAPTIONINFOMichael Niedermayer2015-06-051-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: increase buffer size for parsing metadata string keyMichael Niedermayer2015-06-051-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer2015-04-201-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a3eb042c704dea190c644def5b32c9cee8832b8': Replace av_dlog with normal av_log at trace level Conflicts: ffplay.c libavdevice/fbdev_dec.c libavfilter/avfilter.c libavfilter/internal.h libavfilter/setpts.c libavfilter/src_movie.c libavfilter/vf_crop.c libavfilter/vf_drawtext.c libavfilter/vf_fieldorder.c libavformat/assdec.c libavformat/avidec.c libavformat/flvdec.c libavformat/http.c libavformat/ipmovie.c libavformat/isom.c libavformat/mov.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/mpegtsenc.c libavformat/mux.c libavformat/mxfdec.c libavformat/nsvdec.c libavformat/oggdec.c libavformat/r3d.c libavformat/rtspdec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace av_dlog with normal av_log at trace levelVittorio Giovara2015-04-191-3/+3
| | | | | | | | This applies to every library where performance is not critical.
* | avformat/flvdec: add support for OnCaptionMichael Niedermayer2015-03-131-3/+14
| |
* | avformat/flvdec: re enable flv_data_packet()Michael Niedermayer2015-03-131-2/+7
| | | | | | | | | | | | Found-by: kurosu Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: Change subtitle stream type to subtitle typeMichael Niedermayer2015-03-131-8/+8
| | | | | | | | | | Previous-version-reviewed-by: Andreas Cadhalpun Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'Michael Niedermayer2015-02-141-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e': avformat: Don't anonymously typedef structs Conflicts: libavformat/adtsenc.c libavformat/aiffenc.c libavformat/avidec.c libavformat/gif.c libavformat/iff.c libavformat/img2dec.c libavformat/jvdec.c libavformat/matroskadec.c libavformat/udp.c libavformat/wtvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Don't anonymously typedef structsDiego Biurrun2015-02-141-1/+1
| |
* | avformat/flvdec: remove duplicated line errorClément Bœsch2015-01-011-1/+0
| | | | | | | | | | | | Fix typo regression since 5c37ffca59e7eb1b8768f237deb35a9936c1a0a5 Found-By: cousin_luigi
* | avformat/flvdec: use named identifier instead of literal numbers as return ↵Michael Niedermayer2015-01-011-3/+6
| | | | | | | | | | | | values Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: Increase string array sizeMichael Niedermayer2015-01-011-1/+1
| | | | | | | | | | | | Fixes parsing httphostheader of Scarlatti\,\ Pieter-Jan\ Belder\ -\ Sonata\ K113\ in\ A\ major\ -\ Alle.flv Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: do not inject dts=0 metadata packets which failed to be ↵Michael Niedermayer2015-01-011-3/+3
| | | | | | | | | | | | | | | | | | | | parsed into a new data stream Such data streams (which then contain no other packets except the faulty one) confuse some user applications, like VLC Works around vlcticket 12389 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: add several error messages to error conditionsMichael Niedermayer2015-01-011-2/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: Use av_freep() avoid leaving stale pointers in memoryMichael Niedermayer2014-12-161-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: fix potential use of uninitialized variablesMichael Niedermayer2014-12-101-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '40665d27e38e6a2f65037878202bd1a398c7683e'Michael Niedermayer2014-11-251-0/+4
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-241-0/+4
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae'Michael Niedermayer2014-10-211-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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-211-2/+5
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732242
* | Merge commit 'f22aa6b841dc54fa1dd804303885b1e230a5f629'Michael Niedermayer2014-10-211-0/+1
|\ \ | |/ | | | | | | | | | | | | * 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-211-0/+1
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 718141
* | avformat/flvdec: read the correct bits into the tag typeSteven Liu2014-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-131-0/+1
|\ \ | |/ | | | | | | | | | | * 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-131-0/+1
| | | | | | | | | | | | metadata changes. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '93c04e095dc37ebdab22174e88cfa91e24940866'Michael Niedermayer2014-08-131-40/+42
|\ \ | |/ | | | | | | | | | | * 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-131-40/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-081-1/+1
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'fa14804c83a7108a50c63d1f2180e30c75909529'Michael Niedermayer2014-08-011-2/+5
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-011-2/+5
| | | | | | | | | | 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-231-1/+2
| | | | | | | | | | | | Fixes Ticket 3787 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: give live_flvdec a separate nameMichael Niedermayer2014-06-211-1/+1
| | | | | | | | | | | | 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-161-5/+40
| | | | | | | | | | | | Fixes Ticket3553 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a1859032e39d96352687186fd179e1559dea2aca'Michael Niedermayer2014-06-011-8/+0
|\ \ | |/ | | | | | | | | | | * 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-011-8/+0
| | | | | | | | | | | | | | | | | | 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-271-1/+1
| | | | | | | | | | Found-by: Alessandro Ghedini <alessandro@ghedini.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '152b797cd687e96a582a1cb908dddf3d330d7637'Michael Niedermayer2014-04-241-2/+0
|\ \ | |/ | | | | | | | | | | * 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-231-2/+0
| | | | | | | | Some applications really mean to send negative pts.
* | Merge commit '5d983fdbca5570a1545a892583a372cfb3fffe92'Michael Niedermayer2014-04-241-3/+4
|\ \ | |/ | | | | | | | | | | * commit '5d983fdbca5570a1545a892583a372cfb3fffe92': flv: Warn only once Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: Warn only onceLuca Barbato2014-04-231-1/+1
| | | | | | | | No point in sending the message multiple time.
* | Merge commit '374fdc8c071dcd96422378b0a1a0d453336d8a01'Michael Niedermayer2014-04-241-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '374fdc8c071dcd96422378b0a1a0d453336d8a01': flv: Improve log messages Conflicts: libavformat/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: Improve log messagesLuca Barbato2014-04-231-3/+3
| | | | | | | | | | 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-231-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status