aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
...
* | | lavf: replace remaining use of deprecated get_strz()Paul B Mahol2012-01-242-2/+3
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | buildsys: Fix shared lib build of ffserver.Michael Niedermayer2012-01-241-0/+3
|/ / | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-244-148/+179
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Remove ffmpeg. aacenc: Simplify windowing aacenc: Move saved overlap samples to the beginning of the same buffer as incoming samples. aacenc: Deinterleave input samples before processing. aacenc: Store channel count in AACEncContext. aacenc: Move Q^3/4 calculation to it's own table aacenc: Request normalized float samples instead of converting s16 samples to float. aacpsy: Replace an if with FFMAX in LAME windowing. aacenc: cosmetics, replace 'rd' with 'bits' in codebook_trellis_rate to make it more clear what is being calculated. aacpsy: cosmetics, change a FIXME to a NOTE about subshort comparisons aacenc: cosmetics: move init() and end() to the bottom of the file. aacenc: aac_encode_init() cleanup XWD encoder and decoder vc1: don't read the interpfrm and bfraction elements for interlaced frames mxfdec: fix memleak on mxf_read_close() westwood: split the AUD and VQA demuxers into separate files. Conflicts: .gitignore Changelog Makefile configure doc/ffmpeg.texi ffmpeg.c libavcodec/Makefile libavcodec/aacenc.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/version.h libavformat/Makefile libavformat/img2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * XWD encoder and decoderPaul B Mahol2012-01-231-1/+2
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * mxfdec: fix memleak on mxf_read_close()Janne Grunau2012-01-231-0/+1
| |
| * westwood: split the AUD and VQA demuxers into separate files.Justin Ruggles2012-01-233-147/+177
| | | | | | | | They have no code in common.
* | movenc: Decrease default chunk merge limit to 1mb.Michael Niedermayer2012-01-231-1/+1
| | | | | | | | | | | | | | This reduces the delay when opening the video with quicktime. Idea-by: Maksym Veremeyenko <verem@m1stereo.tv> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | limit chunk size to 1GBMaksym Veremeyenko2012-01-231-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cafdec: fix regression introduced in c7579ad8e84c5Paul B Mahol2012-01-231-2/+2
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: Fix use of stream_index before validation of its range.Michael Niedermayer2012-01-231-2/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cafdec: replace deprecated get_strz()Paul B Mahol2012-01-231-2/+2
| |
* | cafenc: replace deprecated av_dbl2int()Paul B Mahol2012-01-231-2/+2
| |
* | libavformat/libavformat.v: fix application name in commentMichael Niedermayer2012-01-231-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-233-16/+35
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (25 commits) riff: fix invalid av_freep() calls on EOF in ff_read_riff_info pam: Fix a typo that broke writing and reading PAM files. mxfdec: fix memleak on av_realloc failures mxfdec: Do not parse slices or DeltaEntryArrays. mxfdec: hybrid demuxing/seeking solution mxfdec: Add Avid's essence element key. mfxdec: Separate mxf_essence_container_uls for audio and video. mxfdec: Compute packet offsets properly. mxfdec: Use MaterialPackage - Track - TrackID instead of the system_item hack. mxfdec: use av_dlog() for 'no corresponding source package found' mxfdec: Make mxf->partitions sorted by offset. mxfdec: parse ThisPartition mxfdec: Speed up metadata and index parsing. mxfdec: Make sure DataDefinition is consistent between material track and source track. mxfdec: add EssenceContainer UL found in 0001GL00.MXF.A1.mxf_opatom.mxf mxfdec: Add hack that adjusts the n_delta calculation when system items are present. mxfdec: Parse IndexTableSegments and convert them into AVIndexEntry arrays. mxfdec: Move FooterPartition to MXFContext and make sure it is never zero. mxfdec: check return value of avio_seek mxfdec: skip to end of structural sets ... Conflicts: configure libavcodec/pnm.c libavformat/mxfdec.c libavformat/riff.c libavformat/rtsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: fix invalid av_freep() calls on EOF in ff_read_riff_infoJanne Grunau2012-01-221-2/+1
| |
| * mxfdec: fix memleak on av_realloc failuresJanne Grunau2012-01-221-5/+8
| |
| * mxfdec: Do not parse slices or DeltaEntryArrays.Tomas Härdin2012-01-221-76/+10
| | | | | | | | The most recent demuxing/seeking code does not need them.
| * mxfdec: hybrid demuxing/seeking solutionJanne Grunau2012-01-221-143/+454
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This uses the old demuxing code for OP1a and separate demuxing code for OPAtom. Timestamp output is added to the old demuxing code. The seeking code is made to seek to the start of the desired EditUnit only, from which the normal demuxing code takes over (if OP1a). This means we do not use delta entries or slices, only StreamOffsets. OPAtom seeking basically works like before. This also makes D-10 seeking behave the same way as OP1a and OPAtom. In other words, we allow seeking before the start or past the end for D-10 too. Based on several patches by Tomas Härdin <tomas.hardin@codemill.se> and Reimar Döffinger <Reimar.Doeffinger@gmx.de>. Changed av_calloc to av_mallocz, added overflow checks.
| * mxfdec: Add Avid's essence element key.Tomas Härdin2012-01-221-1/+4
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mfxdec: Separate mxf_essence_container_uls for audio and video.Carl Eugen Hoyos2012-01-221-3/+6
| | | | | | | | | | | | | | | | | | It is a really bad idea to assign a video codec id when we have set codec_type to audio and vice versa. Prevents detection of mp2 in mxf as mpeg2video. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mxfdec: Compute packet offsets properly.Tomas Härdin2012-01-221-16/+37
| | | | | | | | | | | | This replaces the old essence_offset code. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mxfdec: Use MaterialPackage - Track - TrackID instead of the system_item hack.Tomas Härdin2012-01-221-13/+10
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mxfdec: use av_dlog() for 'no corresponding source package found'Tomas Härdin2012-01-221-32/+143
| | | | | | | | | | | | This is not an error and expected behavior for OPAtom files. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mxfdec: Make mxf->partitions sorted by offset.Tomas Härdin2012-01-221-1/+15
| | | | | | | | | | | | This also zeroes new entries for good measure (used by future patches). Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mxfdec: parse ThisPartitionTomas Härdin2012-01-221-2/+5
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mxfdec: Speed up metadata and index parsing.Tomas Härdin2012-01-221-10/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | Specifically, this means parsing as before until we run into essence. At that point we seek to the footer and parse until EOF. After that we start seeking backward to the previous partition and parse that until we run into essence or the next partition. This procedure is repeated until we encounter the last partition we parsed in the forward direction. The end result of all this is that large essence containers are not needlessly parsed. This speeds up parsing large files a lot. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mxfdec: Make sure DataDefinition is consistent between material track and ↵Tomas Härdin2012-01-221-5/+12
| | | | | | | | | | | | | | | | | | source track. This fixes 0001GL.MXF.V1.mxf_opatom.mxf and 0001GL00.MXF.A1.mxf_opatom.mxf getting two streams each due to both using the same SourcePackageID. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mxfdec: add EssenceContainer UL found in 0001GL00.MXF.A1.mxf_opatom.mxfTomas Härdin2012-01-221-0/+1
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mxfdec: Add hack that adjusts the n_delta calculation when system items are ↵Tomas Härdin2012-01-221-1/+8
| | | | | | | | | | | | present. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mxfdec: Parse IndexTableSegments and convert them into AVIndexEntry arrays.Janne Grunau2012-01-221-8/+318
| | | | | | | | | | | | | | Based on patch from Tomas Härdin <tomas.hardin@codemill.se> and work by Georg Lippitsch <georg.lippitsch@gmx.at> Changed av_calloc to av_mallocz and added overflow checks.
| * mxfdec: Move FooterPartition to MXFContext and make sure it is never zero.Tomas Härdin2012-01-221-3/+14
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mxfdec: check return value of avio_seekJoakim Plate2012-01-221-1/+4
| | | | | | | | | | | | Avoid modifying state if avio_seek fails. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mxfdec: skip to end of structural setsPhilip de Nier2012-01-221-1/+4
| | | | | | | | | | | | | | | | This fixes reading of partition packs. The code stops reading after the operational pattern and should skip the array of essence container labels that follow. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mxfdec: parse MXF partitionsTomas Härdin2012-01-221-1/+107
| |
| * rtsp: Use a random offset for trying to open UDP ports for RTPDmitry Volyntsev2012-01-221-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids (for all practical cases) the issue of reusing the same UDP port as for an earlier connection. If the remote doesn't know the previous session was closed, he might keep on sending packets to that port. If we always start off trying to open the same UDP port, we might get those packets intermixed with the new ones. This is occasionally an issue when testing RTSP stuff with DSS, perhaps also with other servers. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: Allow specifying the UDP port range via AVOptionsMartin Storsjö2012-01-222-2/+16
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: Remove a leftover, currently pointless checkDmitry Volyntsev2012-01-221-10/+8
| | | | | | | | | | | | | | | | This check isn't relevant in the way the code currently works. Also change a case of if (x == 0) into if (!x). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Revert "movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs"Michael Niedermayer2012-01-221-18/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8e8c51318c1fe4ae61de578f0823b88aa3fe8222. Fixes Ticket873 Conflicts: tests/ref/acodec/pcm_s16be tests/ref/acodec/pcm_s24be tests/ref/acodec/pcm_s32be tests/ref/acodec/pcm_s8 tests/ref/lavf/mov Approved-by: Baptiste Coudurier <baptiste.coudurier@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: fix "avidec.c:362: warning: st may be used uninitialized in this ↵Michael Niedermayer2012-01-221-0/+1
| | | | | | | | | | | | function" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegpsmux: Fix integer overflow with huge VBV sizes.Michael Niedermayer2012-01-221-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | img2: add j2c file extensionJean First2012-01-221-1/+2
| | | | | | | | | | | | | | Some applications use the j2c extension for jpeg2000 codestream files. Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | error_detection: put the old error detection constants back.Michael Niedermayer2012-01-211-0/+3
| | | | | | | | | | | | | | The old constants are more useful to the end user and have orthogonal meanings to the new ones. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-214-9/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtpdec: Use our own SSRC in the SDES field when sending RRs Finalize changelog for 0.8 Release Prepare for 0.8 Release threads: change the default for threads back to 1 threads: update slice_count and slice_offset from user context aviocat: Remove useless includes doc/APIChanges: fill in missing dates and hashes Revert "avserver: fix build after the next bump." mpegaudiodec: switch error detection check to AV_EF_BUFFER lavf: rename fer option and document resulting (f_)err_detect options lavc: rename err_filter option to err_detect and document it mpegvideo: fix invalid memory access for small video dimensions movenc: Reorder entries in the MOVIentry struct, for tigheter packing rtsp: Remove extern declarations for variables that don't exist aviocat: Flush the output before closing Conflicts: Changelog RELEASE libavcodec/mpegaudiodec.c libavcodec/pthread.c libavformat/options.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Use our own SSRC in the SDES field when sending RRsMartin Storsjö2012-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The s->ssrc field is the sender's SSRC, we use ssrc + 1 to get a collision free "unique" SSRC for ourselves in the RR part. The SDES block in the RTCP packet should describe ourselves, not the sender. This was fixed for the RR part in 952139a3226b, but wasn't fixed for the SDES part until now. This could cause some Axis cameras to send RTCP BYE packets to us due to the SSRC collision. Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavf: rename fer option and document resulting (f_)err_detect optionsDustin Brody2012-01-211-3/+8
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * movenc: Reorder entries in the MOVIentry struct, for tigheter packingMartin Storsjö2012-01-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Originally, sizeof(struct MOVIentry) was 48, after the reordering, it is 40 in my build configuration. When writing really long mov/mp4 files, this can make a difference - this saves a bit over 2 MB of memory per hour of video (down to 10.3 MB per hour from 12.3 MB per hour initially) for a video with 75 packets per second - 25 fps + 50 audio packets (which is the case for AMR audio). Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: Remove extern declarations for variables that don't existMartin Storsjö2012-01-211-3/+0
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Support decoding Avid DS Uncompressed (SUDS).Carl Eugen Hoyos2012-01-211-0/+1
| | | | | | | | Fixes ticket #934
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-213-14/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Add a tool that uses avio to read and write, doing a plain copy of data ARM: fix build with FFT enabled and MDCT disabled lavf: force single-threaded decoding in avformat_find_stream_info avidec: migrate last of lavf from FF_ER_* to AV_EF_* avserver: fix build after the next bump. Conflicts: libavformat/Makefile libavformat/avidec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add a tool that uses avio to read and write, doing a plain copy of dataMartin Storsjö2012-01-201-1/+1
| | | | | | | | | | | | | | It also optionally can throttle its operation to a particular speed, to simulate realtime writing. Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-17 14:29:54 +0000