summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-23
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-22
| |
| * pam: Fix a typo that broke writing and reading PAM files.Carl Eugen Hoyos2012-01-22
| | | | | | | | | | | | Reported and reviewed by Derek Buitenhuis. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mxfdec: fix memleak on av_realloc failuresJanne Grunau2012-01-22
| |
| * mxfdec: Do not parse slices or DeltaEntryArrays.Tomas Härdin2012-01-22
| | | | | | | | The most recent demuxing/seeking code does not need them.
| * mxfdec: hybrid demuxing/seeking solutionJanne Grunau2012-01-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-22
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mfxdec: Separate mxf_essence_container_uls for audio and video.Carl Eugen Hoyos2012-01-22
| | | | | | | | | | | | | | | | | | 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-22
| | | | | | | | | | | | 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-22
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mxfdec: use av_dlog() for 'no corresponding source package found'Tomas Härdin2012-01-22
| | | | | | | | | | | | 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-22
| | | | | | | | | | | | 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-22
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mxfdec: Speed up metadata and index parsing.Tomas Härdin2012-01-22
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-22
| | | | | | | | | | | | | | | | | | 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-22
| | | | | | | | 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-22
| | | | | | | | | | | | present. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mxfdec: Parse IndexTableSegments and convert them into AVIndexEntry arrays.Janne Grunau2012-01-22
| | | | | | | | | | | | | | 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-22
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mxfdec: check return value of avio_seekJoakim Plate2012-01-22
| | | | | | | | | | | | 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-22
| | | | | | | | | | | | | | | | 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-22
| |
| * avserver: fix build after the next bump.Anton Khirnov2012-01-22
| | | | | | | | | | | | | | Now that 0.8 is out we can reapply this commit. It breaks shared avserver builds due to avserver using internal libavformat symbols, which are now hidden, so this commit also disables avserver with --enable-shared.
| * rtsp: Use a random offset for trying to open UDP ports for RTPDmitry Volyntsev2012-01-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-22
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: Remove a leftover, currently pointless checkDmitry Volyntsev2012-01-22
| | | | | | | | | | | | | | | | 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>
* | CrystalHD: Back up extradata to allow decoder reinit to work.Philip Langdale2012-01-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a regression that came in when I switched to using the h.264 annex b filter all the time. As the filter modifies extradata, its use violates the statelessness assumption that exists in the 'ffmpeg' command line tool, and maybe elsewhere. It assumes that a docoder can be reinitalised and pointed to an existing stream and get the same results. For now, the only way to meet this requirement is to backup the extradata. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | CrystalHD: Initialise variables to silence valgrind.Philip Langdale2012-01-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs"Michael Niedermayer2012-01-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | build: Describe --nm and -ld options consistentlyAlexander Strasser2012-01-22
| | | | | | | | | | Signed-off-by: Alexander Strasser <eclipse7@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pthread: Change a signal to a broadcast as multiple threadsMichael Niedermayer2012-01-22
| | | | | | | | | | | | have been seen waiting and deadlocking on it in bug125. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | base64: 10l endian fix.Michael Niedermayer2012-01-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: add some asserts() to check refcounts.Michael Niedermayer2012-01-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | build: Support selecting yasm-compatible assemblerAlexander Strasser2012-01-22
| | | | | | | | | | | | | | | | Makes it possible to select the name/path of the tool for compiling the non-inline assembly code. Signed-off-by: Alexander Strasser <eclipse7@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws: Fix unscaled >8bit planar chroma handling.Michael Niedermayer2012-01-22
| | | | | | | | | | | | Fixes Ticket840 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpeg12: fixed parsing in some mpeg2 streamsHendrik Leppkes2012-01-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: fix FF_LOSS_COLORQUANT detection for gray8a->pal8Michael Niedermayer2012-01-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Extract some duplicated code.Reimar Döffinger2012-01-22
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Remove pointless and distracting ()Reimar Döffinger2012-01-22
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Simplify: just add header_size directly.Reimar Döffinger2012-01-22
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Move some duplicated code, simplify.Reimar Döffinger2012-01-22
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Make variable that always has the same value const.Reimar Döffinger2012-01-22
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Optimized base64 decode by writing 3 bytes at once.Reimar Döffinger2012-01-22
| | | | | | | | | | | | | | | | About 25% faster. decode: 248852 -> 200385 decicycles (syntax check unchanged) Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Cosmetics: add do {} while 0 to macro.Reimar Döffinger2012-01-22
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | sws: In case of an invalid scaler algorithm, show the invalid value.Michael Niedermayer2012-01-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: fix "avidec.c:362: warning: st may be used uninitialized in this ↵Michael Niedermayer2012-01-22
| | | | | | | | | | | | function" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | RC: Fix initial buffer occupancy.Michael Niedermayer2012-01-22
| | | | | | | | | | | | | | Fixes Ticket880 Regression since bf174a70cde333eba7e27063f9ce44497108f466 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegpsmux: Fix integer overflow with huge VBV sizes.Michael Niedermayer2012-01-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacenc: Fix bug in writing libavcodec_ident.Michael Niedermayer2012-01-22
| | | | | | | | | | | | | | the written length was off by 2 causing aac decoders to fail with the data. lucky the encoder was marked as experimental and not used much Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support decoding gray8a tiff images.Carl Eugen Hoyos2012-01-22
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 18:40:01 +0000