summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* Demux all parts of concatenated H.264.Reimar Döffinger2012-01-281-2/+1
| | | | | | | | | | | | We may or may not be able to play the latter parts but not demuxing at all seems like the worst possible behaviour. Fixes playback of e.g. http://playlist.yahoo.com/makeplaylist.dll?sid=128114687&sdm=web&pt=rd As a proper solution either multiple video streams should be exported or side data should be used to update extradata if necessary. Signed-off-by: Reimar Döffinger <[email protected]>
* Set AVFMT_TS_NONSTRICT for framecrc muxer.Reimar Döffinger2012-01-281-1/+1
| | | | | | | | | | Since it is set for e.g. webm muxer we should make it possible to test such streams with framecrc, too. Though the primary reason is that this allows the H.264 tests to not run into this check when fixing raw video encode to pass pts values on. Signed-off-by: Reimar Döffinger <[email protected]>
* Merge palette-only header with actual video frame.Reimar Döffinger2012-01-281-4/+18
| | | | | | | | | This fixes the video frame pts (off by one for each MVIh) and makes the "key frames" decode stand-alone (MVIh contains only palette, such a palette-only frame being marked as key frame is not really correct). Signed-off-by: Reimar Döffinger <[email protected]>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-28145-1735/+328
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (71 commits) movenc: Allow writing to a non-seekable output if using empty moov movenc: Support adding isml (smooth streaming live) metadata libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set sunrast: Document the different Sun Raster file format types. sunrast: Add a check for experimental type. libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat lavf: remove disabled FF_API_SET_PTS_INFO cruft lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft lavf: remove disabled FF_API_REORDER_PRIVATE cruft lavf: remove disabled FF_API_SEEK_PUBLIC cruft lavf: remove disabled FF_API_STREAM_COPY cruft lavf: remove disabled FF_API_PRELOAD cruft lavf: remove disabled FF_API_NEW_STREAM cruft lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft lavf: remove disabled FF_API_MUXRATE cruft lavf: remove disabled FF_API_FILESIZE cruft lavf: remove disabled FF_API_TIMESTAMP cruft lavf: remove disabled FF_API_LOOP_OUTPUT cruft lavf: remove disabled FF_API_LOOP_INPUT cruft lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft ... Conflicts: doc/APIchanges libavcodec/8bps.c libavcodec/avcodec.h libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/options.c libavcodec/sunrast.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/h264_deblock.asm libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/avformat.h libavformat/avio.c libavformat/avio.h libavformat/aviobuf.c libavformat/dv.c libavformat/mov.c libavformat/utils.c libavformat/version.h libavformat/wtv.c libavutil/Makefile libavutil/file.c libswscale/x86/input.asm libswscale/x86/swscale_mmx.c libswscale/x86/swscale_template.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <[email protected]>
| * movenc: Allow writing to a non-seekable output if using empty moovMartin Storsjö2012-01-271-2/+13
| | | | | | | | | | | | | | | | | | | | In this mode, no seeks will be done except for within moov/moof fragments, which should fit within the AVIOContext buffer. This allows pushing live smooth streaming format data to a live publishing point on IIS over http. Signed-off-by: Martin Storsjö <[email protected]>
| * movenc: Support adding isml (smooth streaming live) metadataMartin Storsjö2012-01-272-0/+131
| | | | | | | | | | | | | | This metadata is required for pushing a live stream to an IIS publishing point. Signed-off-by: Martin Storsjö <[email protected]>
| * lavf: remove disabled FF_API_SET_PTS_INFO cruftAnton Khirnov2012-01-273-20/+0
| |
| * lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruftAnton Khirnov2012-01-273-38/+0
| |
| * lavf: remove disabled FF_API_REORDER_PRIVATE cruftAnton Khirnov2012-01-272-107/+0
| |
| * lavf: remove disabled FF_API_SEEK_PUBLIC cruftAnton Khirnov2012-01-273-43/+0
| |
| * lavf: remove disabled FF_API_STREAM_COPY cruftAnton Khirnov2012-01-272-7/+0
| |
| * lavf: remove disabled FF_API_PRELOAD cruftAnton Khirnov2012-01-273-10/+0
| |
| * lavf: remove disabled FF_API_NEW_STREAM cruftAnton Khirnov2012-01-273-28/+0
| |
| * lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruftAnton Khirnov2012-01-272-48/+0
| |
| * lavf: remove disabled FF_API_MUXRATE cruftAnton Khirnov2012-01-275-22/+0
| |
| * lavf: remove disabled FF_API_FILESIZE cruftAnton Khirnov2012-01-272-10/+0
| |
| * lavf: remove disabled FF_API_TIMESTAMP cruftAnton Khirnov2012-01-276-30/+0
| |
| * lavf: remove disabled FF_API_LOOP_OUTPUT cruftAnton Khirnov2012-01-273-19/+0
| |
| * lavf: remove disabled FF_API_LOOP_INPUT cruftAnton Khirnov2012-01-273-15/+0
| |
| * lavf: remove disabled FF_API_AVSTREAM_QUALITY cruftAnton Khirnov2012-01-272-12/+0
| |
| * lavf: remove disabled FF_API_FLAG_RTP_HINT cruftAnton Khirnov2012-01-274-17/+0
| |
| * lavf: remove disabled FF_API_SDP_CREATE cruftAnton Khirnov2012-01-273-13/+0
| |
| * lavf: remove disabled FF_API_GUESS_IMG2_CODEC cruftAnton Khirnov2012-01-273-13/+0
| |
| * lavf: remove disabled FF_API_PKT_DUMP cruftAnton Khirnov2012-01-273-26/+0
| |
| * lavf: remove disabled FF_API_FIND_INFO_TAG cruftAnton Khirnov2012-01-273-19/+0
| |
| * lavf: remove disabled FF_API_PARSE_DATE cruftAnton Khirnov2012-01-273-26/+0
| |
| * lavf: remove disabled FF_API_DUMP_FORMAT cruftAnton Khirnov2012-01-273-19/+0
| |
| * lavf: remove disabled FF_API_FORMAT_PARAMETERS cruftAnton Khirnov2012-01-273-260/+0
| | | | | | | | | | Also remove now unused AVFormatParameters struct and AVOutputFormat.set_parameters().
| * lavf: remove disabled FF_API_OLD_METADATA2 cruftAnton Khirnov2012-01-274-113/+2
| |
| * lavf: remove disabled FF_API_OLD_AVIO cruftAnton Khirnov2012-01-276-672/+1
| |
| * lavf: increase major version from 53 to 54.Anton Khirnov2012-01-271-2/+2
| |
| * lavf: remove AVFormatParameters from AVFormatContext.read_header signatureAnton Khirnov2012-01-27116-179/+128
| |
* | Merge remote-tracking branch 'qatar/master'n0.11-devMichael Niedermayer2012-01-272-10/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: smacker: Sanity check huffman tables found in the headers. smacker: remove dead store qdm2: Check data block size for bytes to bits overflow. mxfdec: Fix files with essence containers larger than 2 GiB. mxfdec: Employ correct printf conversion specifiers for POSIX int types. vc1: always read the bfraction element for interlaced fields fate: add XWD image regression test lavf: prevent infinite loops while flushing in avformat_find_stream_info matroskadec: Pad AAC extradata. ismindex: Fix build on mingw Conflicts: libavformat/mxfdec.c libavformat/utils.c tests/lavf-regression.sh Merged-by: Michael Niedermayer <[email protected]>
| * mxfdec: Fix files with essence containers larger than 2 GiB.Tomas Härdin2012-01-261-1/+1
| | | | | | | | | | | | For such files, accumulating into an int would cause an overflow. Signed-off-by: Diego Biurrun <[email protected]>
| * mxfdec: Employ correct printf conversion specifiers for POSIX int types.Jean First2012-01-261-5/+10
| | | | | | | | | | Signed-off-by: Jean First <[email protected]> Signed-off-by: Diego Biurrun <[email protected]>
| * lavf: prevent infinite loops while flushing in avformat_find_stream_infoJanne Grunau2012-01-261-8/+14
| | | | | | | | | | | | | | | | | | If no data was seen for a stream decoder are returning 0 when fed with empty packets for flushing. We can stop flushing when the decoder does not return delayed delayed frames anymore. Changes try_decode_frame() return value to got_picture or negative error. CC: [email protected]
| * matroskadec: Pad AAC extradata.Alex Converse2012-01-251-1/+1
| | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: [email protected]
* | dv: Fix out of array readMichael Niedermayer2012-01-261-4/+6
| | | | | | | | | | | | | | Fixes part of CVE-2011-3936 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* | mov: Fix seeking regression in fragemnted movs.Michael Niedermayer2012-01-261-0/+3
| | | | | | | | | | | | Regression introduced in 550f7c43ece1af27604407647d10e74b52e6fedf Signed-off-by: Michael Niedermayer <[email protected]>
* | matroskadec: increase padding on several more extradata allocations.Michael Niedermayer2012-01-261-2/+2
| | | | | | | | | | Inspired by: 5af569aa30b93f56344ea540936eb671760f568c by alex Signed-off-by: Michael Niedermayer <[email protected]>
* | matroskadec: Pad AAC extradata.Alex Converse2012-01-261-1/+1
| | | | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: [email protected] (cherry picked from commit d2ee8c17793201ce969afd1f433ba1580c143cd2) Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-269-261/+632
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) wma: Clip WMA1 and WMA2 frame length to 11 bits. movenc: Don't require frame_size to be set for modes other than mov doc: Update APIchanges with info on muxer flushing movenc: Reindent a block tools: Remove some unnecessary #undefs. rv20: prevent calling ff_h263_decode_mba() with unset height/width tools: K&R reformatting cosmetics Ignore generated aviocat and ismindex tools. build: Automatically include architecture-specific library Makefile snippets. indeo5: prevent null pointer dereference on broken files pktdumper: Use usleep instead of sleep cosmetics: Remove some unnecessary block braces. Drop unnecessary prefix from *sink* variable and struct names. Add a tool for creating smooth streaming manifests movdec: Calculate an average bit rate for fragmented streams, too movenc: Write the sample rate instead of time scale in the stsd atom movenc: Add a separate ismv/isma (smooth streaming) muxer movenc: Allow the caller to decide on fragmentation libavformat: Add a flag for muxers that support write_packet(NULL) for flushing movenc: Add support for writing fragmented mov files ... Conflicts: Changelog cmdutils.c cmdutils.h doc/APIchanges ffmpeg.c ffplay.c libavfilter/Makefile libavformat/Makefile libavformat/avformat.h libavformat/movenc.c libavformat/movenc.h libavformat/version.h tools/graph2dot.c Merged-by: Michael Niedermayer <[email protected]>
| * movenc: Don't require frame_size to be set for modes other than movMartin Storsjö2012-01-251-1/+1
| | | | | | | | | | | | | | | | | | The field frame_size isn't written to the output anywhere except than in mov. This facilitates stream copy from formats that don't set frame_size. Signed-off-by: Martin Storsjö <[email protected]>
| * movenc: Reindent a blockMartin Storsjö2012-01-251-13/+15
| | | | | | | | | | | | | | Also add some space around operators and wrap a comment that extends past the 80 char "limit"/guideline. Signed-off-by: Martin Storsjö <[email protected]>
| * Add a tool for creating smooth streaming manifestsMartin Storsjö2012-01-251-1/+1
| | | | | | | | | | | | | | | | It can also optionally split the file into individual fragments, which allows it to be served from any web server without any server side support. Signed-off-by: Martin Storsjö <[email protected]>
| * movdec: Calculate an average bit rate for fragmented streams, tooMartin Storsjö2012-01-252-1/+15
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
| * movenc: Write the sample rate instead of time scale in the stsd atomMartin Storsjö2012-01-251-2/+2
| | | | | | | | | | | | | | For ismv/isma, the time scale might not be the same as the sample rate. Signed-off-by: Martin Storsjö <[email protected]>
| * movenc: Add a separate ismv/isma (smooth streaming) muxerMartin Storsjö2012-01-254-5/+141
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
| * movenc: Allow the caller to decide on fragmentationMartin Storsjö2012-01-252-8/+21
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
| * libavformat: Add a flag for muxers that support write_packet(NULL) for flushingMartin Storsjö2012-01-253-5/+25
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>