summaryrefslogtreecommitdiffstats
path: root/libavformat/flvdec.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-111-0/+9
|\ | | | | | | | | | | | | | | | | | | * 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-111-0/+6
| | | | | | | | | | | | | | | | | | 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-101-1/+1
| | | | | | | | | | | | | | 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-251-2/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Enable parser in FLV demuxer for H264 codecAlex Sukhanov2013-12-151-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: use avpriv_request_sample()Paul B Mahol2013-10-181-2/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat: use ff_alloc_extradata()Paul B Mahol2013-10-131-6/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'c951e4b442df9dde6051634a85359eb809bf2142'Michael Niedermayer2013-09-231-19/+69
|\ \ | |/ | | | | | | | | | | * commit 'c951e4b442df9dde6051634a85359eb809bf2142': flv: Make onTextData parsing robust Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: Make onTextData parsing robustLuca Barbato2013-09-221-19/+69
| | | | | | | | Certain streaming servers do not preserve the order of the fields.
* | Merge commit '0a9425d7cfdf0113c3d32096c9406823efe0cd0a'Michael Niedermayer2013-09-171-1/+2
|\ \ | |/ | | | | | | | | | | * 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-161-1/+2
| | | | | | | | It is used internally.
* | Merge commit 'f4634ae8a83d13a1abf3baac8956a3111aa09ed2'Michael Niedermayer2013-08-281-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'f4634ae8a83d13a1abf3baac8956a3111aa09ed2': flv: Fix the help string Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: Fix the help stringLuca Barbato2013-08-271-1/+1
| |
* | flvdec: silence unused warningMichael Niedermayer2013-08-021-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f900f35ac8db4ac30df6fda1c27502c2ef9e6ba5'Michael Niedermayer2013-08-021-11/+7
|\ \ | |/ | | | | | | | | | | * commit 'f900f35ac8db4ac30df6fda1c27502c2ef9e6ba5': flvdec: Eliminate completely silly goto Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: Eliminate completely silly gotoDiego Biurrun2013-08-011-11/+7
| |
* | Merge commit 'e4529df944616917ae8462f5102253ff7f983093'Michael Niedermayer2013-08-021-339/+410
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-011-323/+386
| |
* | Merge commit '390b4d7088b5cecace245fee0c54a57e24dabdf4'Michael Niedermayer2013-08-021-1/+1
|\ \ | |/ | | | | | | | | | | * 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-011-1/+1
| |
| * Remove unreachable returnsDiego Biurrun2013-07-271-4/+0
| |
* | Rename "AVClass class" as "AVClass component_class".Carl Eugen Hoyos2013-06-301-2/+2
| | | | | | | | The aix header math.h defines "extern int class()" for C.
* | flvdec: Fix mistakenly discarding metadata at dts==0Atli Thorbjornsson2013-06-071-7/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Remove two anonymous arrays.Carl Eugen Hoyos2013-04-171-1/+2
| | | | | | | | Fixes compilation of pngenc.c and flvdec.c with PGC 13.4-0.
* | flvdec: fix seeking in audio only filesMichael Niedermayer2013-04-031-1/+1
| | | | | | | | | | | | Fixes Seeking with the file in Ticket2283 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-03-291-1/+8
|\ \ | |/ | | | | | | | | | | * qatar/master: flvdec: read audio sample size and channels metadata Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: read audio sample size and channels metadataJustin Ruggles2013-03-281-1/+8
| | | | | | | | | | This is needed in order for the FLV demuxer not to detect a codec change when using the "flv_metadata" option.
* | Merge commit 'c3d015775388882b8a122afc337ea35108f652be'Michael Niedermayer2013-03-291-1/+2
|\ \ | |/ | | | | | | | | | | * commit 'c3d015775388882b8a122afc337ea35108f652be': flvdec: use the correct audio codec id when parsing metadata Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: use the correct audio codec id when parsing metadataJustin Ruggles2013-03-281-1/+2
| |
* | Merge commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9'Michael Niedermayer2013-03-021-2/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9': h264: do not copy ref count/ref2frm when updating per-frame context flvdec: Check the return value of a malloc Conflicts: libavformat/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: Check the return value of a mallocMartin Storsjö2013-03-021-2/+6
| | | | | | | | | | | | | | | | | | | | The callers of this function can't report errors sanely. If this one malloc fails, don't write the extradata byte, make sure we try to malloc it the next time we're called instead, and make sure we still consume the input data byte. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'c91c63b5380bf79655c09320774a022f84d76fd5'Michael Niedermayer2013-03-021-7/+9
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'c91c63b5380bf79655c09320774a022f84d76fd5': flvdec: Don't read the VP6 header byte when setting codec type based on metadata Conflicts: libavformat/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: Don't read the VP6 header byte when setting codec type based on metadataMartin Storsjö2013-03-021-7/+9
| | | | | | | | | | | | | | | | | | This header byte is only present when actually reading a VP6 frame, not when reading the codec type field in the metadata. This potential bug has been present since 5b54a90c. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Do not change codec in flv streams if the user has forced a codec.Carl Eugen Hoyos2013-02-011-2/+2
| | | | | | | | Fixes ticket #2218.
* | flvdec: disable hack that attempts to parse aac bitstream in the flv demuxer.Michael Niedermayer2012-11-171-1/+1
| | | | | | | | | | | | | | | | | | I was unable to find a file that needs this hack, if you have one please contact us! Fixes out of array accesses. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'Michael Niedermayer2012-11-131-0/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b': (21 commits) jvdec: set channel layout iss: set channel layout ipmovie: set channel layout iff: set channel layout idroqdec: set channel layout gxfdec: set channel layout when applicable gsmdec: set channel layout flvdec: set channel layout dv: set channel layout dsicin: set channel layout daud: set channel layout cdxl: set channel layout bmv: set channel layout bink: set channel layout bfi: set channel layout bethsoftvid: set channel layout apc: set channel layout amr: set channel_layout ppc: replace pointer casting with AV_COPY32 ppc: fix some unused variable warnings ... Conflicts: libavformat/amr.c libavformat/iff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: set channel layoutJustin Ruggles2012-11-121-0/+4
| |
* | flvdec: check return value of create_stream()Paul B Mahol2012-10-151-0/+2
| | | | | | | | | | | | Fixes null pointer dereference. Fixes CID732242. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-111-1/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtpdec_jpeg: Add support for default quantizers x86: dsputil: Move specific optimization settings out of global init function avplay: get rid of ugly casts in the options table avplay: fix prototypes for option callbacks. flvdec: always set AVFMTCTX_NOHEADER. file: Use a normal private context for storing the file descriptor configure: Adjust the xgetbv instrinsic check configure: Add --disable-inline-asm command line option configure: Don't try to enable the log2 function on msvcrt Conflicts: configure ffplay.c libavcodec/x86/dsputil_mmx.c libavformat/file.c libavformat/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: always set AVFMTCTX_NOHEADER.Anton Khirnov2012-09-111-4/+1
| | | | | | | | New streams may be created at any time, e.g. on codec change.
* | Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-051-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union memberMartin Storsjö2012-09-041-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | flvdec: fix creation of lots of phantom data streamsMichael Niedermayer2012-09-021-2/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fix flv new stream handling after head already parsedRoman Arutyunyan2012-09-011-4/+6
| | | | | | | | | | | | | | | | | | | | | | This fixes stream lookup in flv demuxer. When used with librtmp protocol streams are sometimes added after head arrived. If the first stream added in flv header reader is Audio stream then it is messed with Video stream added later in the code patched. The result is I have 2 Audio streams (first of them is said to have a video codec like h264) instead of Audio/Video pair. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | flvdec: remove duplicate returnMichael Niedermayer2012-08-311-4/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-46/+46
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-071-42/+42
| |
* | flvdec: follow packets backward until a valid last timestamp is foundMichael Niedermayer2012-08-031-2/+9
| | | | | | | | | | | | Fixed Ticket981 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | flvdec: perform duration search just onceMichael Niedermayer2012-08-031-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-311-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpc8: return more meaningful error codes. mpc: return more meaningful error codes. wv,mpc8: don't return apetag data in packets. rtmp: do not warn about receiving metadata packets x86: h264dsp: Adjust YASM #ifdefs x86: yadif: Mark mmxext optimizations as such h264: convert loop filter strength dsp function to yasm. Improve descriptiveness of a number of codec and container long names Conflicts: libavcodec/flvdec.c libavcodec/libopenjpegdec.c libavformat/apetag.c libavformat/mp3dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud