aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
...
* | sierravmd: limit packetsize to the amount that could be read.Michael Niedermayer2011-12-241-0/+3
| | | | | | | | | | | | Fixes huge allocations. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rmdec: Avoid allocating huge packetsMichael Niedermayer2011-12-241-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rpl: Fix near infinite loop in index reading due to missing eof check.Michael Niedermayer2011-12-241-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Make the palette in Quake II CIN files opaque and increase its dynamics.Carl Eugen Hoyos2011-12-241-1/+3
| |
* | Make mov palette opaque or load alpha if present.Carl Eugen Hoyos2011-12-241-8/+7
| |
* | Make the avi palette opaque.Carl Eugen Hoyos2011-12-241-6/+2
| |
* | avio: fix handling of , in urlsMichael Niedermayer2011-12-231-1/+2
| | | | | | | | | | | | Fixes Ticket805 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | flvdec: disable new midstream param change code not only for h264 but all cases.Michael Niedermayer2011-12-231-1/+1
| | | | | | | | | | | | It breaks some samples and iam not aware of one that it fixes. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-233-9/+67
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: fix standalone compilation of OMA muxer build: fix standalone compilation of Microsoft XMV demuxer build: fix standalone compilation of Core Audio Format demuxer kvmc: fix invalid reads 4xm: Add a check in decode_i_frame to prevent buffer overreads adpcm: fix IMA SMJPEG decoding options: set minimum for "threads" to zero bsd: use number of logical CPUs as automatic thread count windows: use number of CPUs as automatic thread count linux: use number of CPUs as automatic thread count pthreads: reset active_thread_type when slice thread_init returrns early v410dec: include correct headers Drop ALT_ prefix from BITSTREAM_READER_LE name. lavfi: always build vsrc_buffer. ra144enc: zero the reflection coeffs if the filter is unstable sws: readd PAL8 to isPacked() mov: Don't stick the QuickTime field ordering atom in extradata. truespeech: fix invalid reads in truespeech_apply_twopoint_filter() Conflicts: configure libavcodec/4xm.c libavcodec/avcodec.h libavfilter/Makefile libavfilter/allfilters.c libavformat/Makefile libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: fix standalone compilation of OMA muxerDiego Biurrun2011-12-231-1/+1
| | | | | | | | The muxer depends on the id3v2 writing code, so link against it.
| * build: fix standalone compilation of Microsoft XMV demuxerDiego Biurrun2011-12-231-1/+1
| | | | | | | | The demuxer depends on the RIFF codec tags code, so link against it.
| * build: fix standalone compilation of Core Audio Format demuxerDiego Biurrun2011-12-231-1/+2
| | | | | | | | | | The demuxer depends on code from mov.c, which in turn depends on code from mov_chan.c, so link against it.
| * mov: Don't stick the QuickTime field ordering atom in extradata.Alex Converse2011-12-212-2/+64
| | | | | | | | | | | | The 'fiel' atoms can be found in H.264 tracks clobbering the extradata. MJPEG supports non field based extradata, and this data should be preserved when copying.
* | udp: support non blocking reads with fifoMichael Niedermayer2011-12-231-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | udp: Replace double select() by select+mutex+cond.Michael Niedermayer2011-12-231-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no data was available both the buffer thread as well as the main thread would block in select(), when data becomes available both should move forward and as data is read in the buffer thread the main thread would block in select() later the read data was put in the fifo but the main thread still would be blocked in select() until either the timeout or another packet would come in. This is solved in this commit by using a mutex and a condition variable Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | udp: return circular buffer error if such error happened.Michael Niedermayer2011-12-231-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'tjoppen/fuzz_fixes'Michael Niedermayer2011-12-221-11/+44
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tjoppen/fuzz_fixes: mxfdec: Don't crash in mxf_packet_timestamps() if current_edit_unit overflows mxfdec: Zero nb_ptses in mxf_compute_ptses_fake_index() mxfdec: Sanity check PreviousPartition mxfdec: Never seek back in local sets and KLVs mxfdec: Move the current_partition check inside mxf_read_header() mxfdec: Fix infinite loop in mxf_packet_timestamps() mxfdec: Check url_feof() in mxf_read_local_tags() mxfdec: Check for NULL component Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mxfdec: Don't crash in mxf_packet_timestamps() if current_edit_unit overflowsTomas Härdin2011-12-211-2/+2
| | |
| * | mxfdec: Zero nb_ptses in mxf_compute_ptses_fake_index()Tomas Härdin2011-12-211-1/+3
| | | | | | | | | | | | This fixes SIGSEGV on files with both CBR and VBR index segments (zzuf6.mxf).
| * | mxfdec: Sanity check PreviousPartitionTomas Härdin2011-12-211-0/+7
| | | | | | | | | | | | Without this certain files could get the demuxer stuck in a loop
| * | mxfdec: Never seek back in local sets and KLVsTomas Härdin2011-12-211-0/+15
| | | | | | | | | | | | | | | | | | | | | Specially crafted files can lead the parsing code to take too long. We fix a lot of these problems by not allowing local tags to extend past the end of the set and not allowing other KLVs to be read past the end of themselves.
| * | mxfdec: Move the current_partition check inside mxf_read_header()Tomas Härdin2011-12-211-5/+6
| | | | | | | | | | | | This fixes SIGSEGV on files where this is actually the case, such as zzuf4.mxf
| * | mxfdec: Fix infinite loop in mxf_packet_timestamps()Tomas Härdin2011-12-211-1/+9
| | | | | | | | | | | | | | | This can happen if an index table segment has a very large IndexStartPosition. zzuf3.mxf is an example of such a file.
| * | mxfdec: Check url_feof() in mxf_read_local_tags()Tomas Härdin2011-12-211-1/+1
| | | | | | | | | | | | This fixes the infinite loop with zzuf2.mxf
| * | mxfdec: Check for NULL componentTomas Härdin2011-12-211-1/+1
| | | | | | | | | | | | This fixes SIGSEGV with zzuf1.mxf
* | | lavf: Add SMJPEG demuxer.Paul B Mahol2011-12-224-1/+186
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | libavformat: increase LIBAVFORMAT_VERSION_MICRO to 100Michael Niedermayer2011-12-222-1/+3
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-228-28/+139
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) asfdec: add side data to ASFStream packet instead of output packet. idroqdec: set AVFMTCTX_NOHEADER and create streams as they occur. nellymoserdec: Indicate that the decoder can handle changed parameters libavcodec: Apply parameter change side data when decoding audio flvdec: Add param change side data if the sample rate or channels have changed libavformat: Add a utility function for adding parameter change side data libavcodec: Define a side data type for parameter changes aacdec: Handle new extradata passed as side data flvdec: Export new AAC/H.264 extradata as side data on the next packet libavcodec: Define a side data type for new extradata flacdec: skip all track indices at once instead of looping. mxf: Add PictureEssenceCoding UL for V210. mxfdec: consider QuantizationBits between 17 and 24 to be pcm_s24* mxfenc: Add support for MPEG-2 MP@HL-14 in mxf container. mxf: H.264/MPEG-4 AVC Intra support configure: Show whether the safe bitstream reader is enabled x86: Tighten register constraints for decode_significance*_x86. Replace Subversion revisions in comments by Git hashes. h264_cabac: synchronize decode_significance_*_x86 conditionals w32threads: wait for the waked thread in pthread_cond_signal. ... Conflicts: libavcodec/avcodec.h libavcodec/version.h libavformat/flvdec.c libavformat/utils.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | asfdec: add side data to ASFStream packet instead of output packet.Justin Ruggles2011-12-211-1/+1
| | | | | | | | | | | | fixes memleak of side data
| * | idroqdec: set AVFMTCTX_NOHEADER and create streams as they occur.Justin Ruggles2011-12-211-13/+14
| | | | | | | | | | | | | | | | | | This fixes demuxing of file where the first packet is not audio. Such files are generated by our idroq muxer. It also fixes demuxing of audio only idroq files.
| * | flvdec: Add param change side data if the sample rate or channels have changedMartin Storsjö2011-12-211-6/+25
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | libavformat: Add a utility function for adding parameter change side dataMartin Storsjö2011-12-212-0/+51
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | flvdec: Export new AAC/H.264 extradata as side data on the next packetMartin Storsjö2011-12-211-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compared to just overwriting the old extradata, this has the advantage of letting the decoder know exactly when the extradata changed (otherwise it is changed immediately when the new extradata packet is demuxed, even if there's old queued packets awaiting to be decoded). This makes it easier for decoders to actually react to the change, so they won't have to inspect the extradata for each packet to see if it might have changed. This works when sequentially playing a file with sample rate changes, but if seeking past a new extradata packet in the file, it obviously doesn't work properly. That case doesn't work in flash player either, so it's probably ok not to handle it. Signed-off-by: Martin Storsjö <martin@martin.st>
| * | flacdec: skip all track indices at once instead of looping.Paul B Mahol2011-12-211-3/+2
| | | | | | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * | mxf: Add PictureEssenceCoding UL for V210.Tomas Härdin2011-12-211-0/+1
| | | | | | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * | mxfdec: consider QuantizationBits between 17 and 24 to be pcm_s24*Tomas Härdin2011-12-211-2/+2
| | | | | | | | | | | | | | | | | | This fixes playback of BRD38772509.mxf. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * | mxfenc: Add support for MPEG-2 MP@HL-14 in mxf container.Daniel Kristjansson2011-12-211-0/+4
| | | | | | | | | | | | | | | | | | | | | Support Main Profile at High 1440 Level in MXF container, using essence coding label from SMPTE RDD 9, table 6. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * | mxf: H.264/MPEG-4 AVC Intra supportBaptiste Coudurier2011-12-211-0/+1
| | | | | | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * | network: properly declare WSADATA in windowsSergey Radionov2011-12-211-1/+4
| | | | | | | | | | | | | | | | | | Fixed "ISO C90 forbids mixed declarations and code" in ff_network_init Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | | ipmovie: fix FPEMichael Niedermayer2011-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | Fixed Ticket807 Bug found by: Oana Stratulat Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | mov: replace AVERROR(EOF) with AVERROR_EOF.Nicolas George2011-12-211-1/+1
| | |
* | | Merge remote-tracking branch 'tjoppen/mxf_fixes_20111220'Michael Niedermayer2011-12-211-4/+16
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * tjoppen/mxf_fixes_20111220: mxfdec: Sanity-check SampleRate mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps() mxfdec: Remove unused variables mxfdec: Make sure x < index_table->nb_ptses mxfdec: Ignore the last entry in Avid's index table segments Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mxfdec: Sanity-check SampleRateTomas Härdin2011-12-201-0/+1
| | | | | | | | | | | | This avoids a SIGFPE if SampleRate is missing or set to naughty values.
| * | mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps()Tomas Härdin2011-12-201-0/+5
| | | | | | | | | | | | | | | Only the OPAtom demuxing logic is guaranteed to have index tables, meaning OP1a files that lack an index would cause SIGSEGV.
| * | mxfdec: Remove unused variablesTomas Härdin2011-12-201-2/+2
| | |
| * | mxfdec: Make sure x < index_table->nb_ptsesTomas Härdin2011-12-201-0/+6
| | | | | | | | | | | | Without this the demuxer will SIGSEGV on files with IndexEntryCount < IndexDuration
| * | mxfdec: Ignore the last entry in Avid's index table segmentsTomas Härdin2011-12-201-2/+7
| | | | | | | | | | | | | | | | | | The last entry is the total size of the essence container. Previously a TemporalOffset error would be logged, even though segments like these are expected.
* | | avio: remove ENOTSUP mention in doxy as its not available on all supported ↵Michael Niedermayer2011-12-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | platforms and thus cannot be used Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-213-3/+15
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: always align height by 32 pixel raw: add 10bit YUV definitions nut: support 10bit YUV mpegvideo_enc: separate declarations and statements oma: make header compile standalone vp3: Reorder some functions to fix VP3 build with Theora disabled. build: fix standalone compilation of ADX encoder build: fix standalone compilation of ADPCM decoders build: fix standalone compilation of mpc7/mpc8 decoders 4xm: Use bytestream2 functions to prevent overreads bytestream: add a new set of bytestream functions with overread checking mpegts: Suppress invalid timebase warnings on DMB streams. mpegts: Fix typo in handling sections in the PMT. vc1dec: Use the right pointer type for the tmp pointer Conflicts: libavcodec/4xm.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/vp3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | nut: support 10bit YUVLuca Barbato2011-12-211-0/+6
| | | | | | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>