summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-14
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtpdec: Use 4 byte startcodes for H.264 matroskadec: Mark variable as av_unused. Move some conditionally used variables into the block where they are used. Drop some completely unnecessary av_unused attributes. swscale: Remove unused variable alpMmxFilter. Drop unnecessary av_uninit attributes from some variable declarations. movenc: Support muxing wmapro in ismv/isma mpegtsenc: Add an AVOption for forcing a new PAT/PMT/SDT to be written swscale: move YUV2PACKED16WRAPPER() macro down to where it is used. swscale: handle gray16 as a "planar" YUV format (Y-only, of course). swscale: use yuv2packed1() functions for unscaled chroma also. swscale: fix incorrect chroma bias in yuv2rgb48_1_c(). swscale: fix invalid memory accesses in yuvpacked1() functions. Move PS2 MMI code below the mips subdirectory, where it belongs. mips: Move MMI function declarations to a header. build: Set correct dependencies for rtmp* protocols implemented by librtmp. Conflicts: libavcodec/ac3enc_template.c libavformat/mpegtsenc.c libswscale/output.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Use 4 byte startcodes for H.264Matthew Szatmary2012-02-13
| | | | | | | | | | | | | | | | If muxing into mpegts, 4 byte startcodes for the first NAL of an access unit is required. Thus it is simplest for the RTP depacketizer to just use 4 byte startcodes everywhere. Signed-off-by: Martin Storsjö <martin@martin.st>
| * matroskadec: Mark variable as av_unused.Diego Biurrun2012-02-13
| | | | | | | | This avoids unused variable warnings when zlib/bzlib are not available.
| * Move some conditionally used variables into the block where they are used.Diego Biurrun2012-02-13
| | | | | | | | This allows dropping the av_unused argument from them.
| * Drop some completely unnecessary av_unused attributes.Diego Biurrun2012-02-13
| |
| * movenc: Support muxing wmapro in ismv/ismaMartin Storsjö2012-02-13
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * mpegtsenc: Add an AVOption for forcing a new PAT/PMT/SDT to be writtenMartin Storsjö2012-02-13
| | | | | | | | | | | | | | | | When segmenting the output from the mpegts muxer, one can now set this option when cutting to a new segment, to make sure the next segment starts with PAT/PMT/SDT. Signed-off-by: Martin Storsjö <martin@martin.st>
| * build: Set correct dependencies for rtmp* protocols implemented by librtmp.Diego Biurrun2012-02-13
| |
| * lavf: fix aspect ratio mismatch message.Andrey Utkin2012-02-12
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | matroskadec: properly fall back to generic seek.Reimar Döffinger2012-02-13
| | | | | | | | | | | | | | | | | | | | In particular, detect when the index is obviously broken. This fixes the worst symptoms of trac issue #958 and makes sense to allow seeking in files without index. However it is possible that there still is an index parsing bug with that file. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | matroskadec: reset num_levels on seek.Reimar Döffinger2012-02-13
| | | | | | | | | | | | | | Otherwise when we run into levels beyond the max. allowed playback will be permanently broken. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Fix aspect ratio mismatch messageAndrey Utkin2012-02-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix Theora-in-ogg keyframe handling.Reimar Döffinger2012-02-12
| | | | | | | | | | | | | | | | | | | | | | To make seeking work correctly, we must write a new granule for each keyframe. Unfortunately we currently have no regression tests due to no included Theora encoder. A test based on -vcodec copy from a Theora FATE sample should probably be added. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Modified to generate PAT/PMT for video keyframesPavel Koshevoy2012-02-11
| | | | | | | | | | | | | | | | | | | | | | | | | | This is so that TS fragments produced by http://code.google.com/p/httpsegmenter/ would be compatible with JW Player. A new member variable prev_payload_key was added to MpegTSWriteStream to help detect transition from non-key to key frame, so that PAT/PMT would not be produced for every keyframe in intra-only videos. Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | buildsys: Fix shared lib build of MPlayer.Ingo Brückl2012-02-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (38 commits) v210enc: remove redundant check for pix_fmt wavpack: allow user to disable CRC checking v210enc: Use Bytestream2 functions cafdec: Check return value of avio_seek and avoid modifying state if it fails yop: Check return value of avio_seek and avoid modifying state if it fails tta: Check return value of avio_seek and avoid modifying state if it fails tmv: Check return value of avio_seek and avoid modifying state if it fails r3d: Check return value of avio_seek and avoid modifying state if it fails nsvdec: Check return value of avio_seek and avoid modifying state if it fails mpc8: Check return value of avio_seek and avoid modifying state if it fails jvdec: Check return value of avio_seek and avoid modifying state if it fails filmstripdec: Check return value of avio_seek and avoid modifying state if it fails ffmdec: Check return value of avio_seek and avoid modifying state if it fails dv: Check return value of avio_seek and avoid modifying state if it fails bink: Check return value of avio_seek and avoid modifying state if it fails Check AVCodec.pix_fmts in avcodec_open2() svq3: Prevent illegal reads while parsing extradata. remove ParseContext1 vc1: use ff_parse_close mpegvideo parser: move specific fields into private context ... Conflicts: libavcodec/4xm.c libavcodec/aacdec.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/mpeg4video_parser.c libavcodec/svq3.c libavcodec/v210enc.c libavformat/cafdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cafdec: Check return value of avio_seek and avoid modifying state if it failsJoakim Plate2012-02-10
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * yop: Check return value of avio_seek and avoid modifying state if it failsJoakim Plate2012-02-10
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * tta: Check return value of avio_seek and avoid modifying state if it failsJoakim Plate2012-02-10
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * tmv: Check return value of avio_seek and avoid modifying state if it failsJoakim Plate2012-02-10
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * r3d: Check return value of avio_seek and avoid modifying state if it failsJoakim Plate2012-02-10
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * nsvdec: Check return value of avio_seek and avoid modifying state if it failsJoakim Plate2012-02-10
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * mpc8: Check return value of avio_seek and avoid modifying state if it failsJoakim Plate2012-02-10
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * jvdec: Check return value of avio_seek and avoid modifying state if it failsJoakim Plate2012-02-10
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * filmstripdec: Check return value of avio_seek and avoid modifying state if ↵Joakim Plate2012-02-10
| | | | | | | | | | | | | | it fails Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * ffmdec: Check return value of avio_seek and avoid modifying state if it failsJoakim Plate2012-02-10
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * dv: Check return value of avio_seek and avoid modifying state if it failsJoakim Plate2012-02-10
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * bink: Check return value of avio_seek and avoid modifying state if it failsJoakim Plate2012-02-10
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * rtpenc: Write a log message if the max packet size is too smallMartin Storsjö2012-02-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * dv: Move a table used only by the demuxer out of a shared header.Alex Converse2012-02-09
| |
| * dv: Fix small overread in audio frequency table.Alex Converse2012-02-09
| | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
* | lavf: Rewrite metadata printing from dump_metadata().Michael Niedermayer2012-02-10
| | | | | | | | | | | | This code contained several bugs that mis-formated the output. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (26 commits) eac3dec: replace undefined 1<<31 with INT32_MIN in noise generation yadif: specify array size outside DECLARE_ALIGNED prores: specify array size outside DECLARE_ALIGNED brackets. WavPack demuxer: set packet duration tta: use skip_bits_long() mxfdec: Ignore the last entry in Avid's index table segments mxfdec: Sanity-check SampleRate mxfdec: Handle small EditUnitByteCount mxfdec: Consider OPAtom files that do not have exactly one EC to be OP1a 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 eof_reached in mxf_read_local_tags() mxfdec: Check for NULL component mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps() mxfdec: Make sure x < index_table->nb_ptses build: Add missing directories to DIRS declarations. ... Conflicts: doc/build_system.txt doc/fate.texi libavfilter/x86/yadif_template.c libavformat/mxfdec.c libavutil/Makefile tests/fate/audio.mak tests/fate/prores.mak tests/fate/screen.mak tests/fate/video.mak tests/ref/fate/bethsoft-vid tests/ref/fate/cscd tests/ref/fate/dfa4 tests/ref/fate/nuv tests/ref/fate/vp8-sign-bias tests/ref/fate/wmv8-drm tests/ref/lavf/gxf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * WavPack demuxer: set packet durationPaul B Mahol2012-02-09
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * mxfdec: Ignore the last entry in Avid's index table segmentsTomas Härdin2012-02-09
| | | | | | | | | | | | | | | | 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. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * mxfdec: Sanity-check SampleRateTomas Härdin2012-02-09
| | | | | | | | | | | | This avoids a SIGFPE if SampleRate is missing or set to naughty values. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * mxfdec: Handle small EditUnitByteCountTomas Härdin2012-02-09
| | | | | | | | | | | | | | These are common with audio atoms. Without this the demuxer would read two bytes at a time for a mono 16-bit file. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * mxfdec: Consider OPAtom files that do not have exactly one EC to be OP1aTomas Härdin2012-02-09
| | | | | | | | | | | | This fixes demuxing of 2011_DCPTEST_24FPS.V.mxf. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * mxfdec: Don't crash in mxf_packet_timestamps() if current_edit_unit overflowsTomas Härdin2012-02-09
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * mxfdec: Zero nb_ptses in mxf_compute_ptses_fake_index()Tomas Härdin2012-02-09
| | | | | | | | | | | | This fixes SIGSEGV on files with both CBR and VBR index segments (zzuf6.mxf). Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * mxfdec: Sanity check PreviousPartitionTomas Härdin2012-02-09
| | | | | | | | | | | | Without this certain files could get the demuxer stuck in a loop. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * mxfdec: Never seek back in local sets and KLVsTomas Härdin2012-02-09
| | | | | | | | | | | | | | | | | | 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. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * mxfdec: Move the current_partition check inside mxf_read_header()Tomas Härdin2012-02-09
| | | | | | | | | | | | This fixes SIGSEGV on files where this is the case, such as zzuf4.mxf. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * mxfdec: Fix infinite loop in mxf_packet_timestamps()Tomas Härdin2012-02-09
| | | | | | | | | | | | | | This can happen if an index table segment has a very large IndexStartPosition. zzuf3.mxf is an example of such a file. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * mxfdec: Check eof_reached in mxf_read_local_tags()Tomas Härdin2012-02-09
| | | | | | | | | | | | This fixes an infinite loop with zzuf2.mxf. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * mxfdec: Check for NULL componentTomas Härdin2012-02-09
| | | | | | | | | | | | This fixes a SIGSEGV with zzuf1.mxf. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps()Tomas Härdin2012-02-09
| | | | | | | | | | | | | | Only the OPAtom demuxing logic is guaranteed to have index tables, meaning OP1a files that lack an index would cause SIGSEGV. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * mxfdec: Make sure x < index_table->nb_ptsesTomas Härdin2012-02-09
| | | | | | | | | | | | Avoids a SIGSEGV on files with IndexEntryCount < IndexDuration. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * apetag: fix commentPaul B Mahol2012-02-08
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | Allow encoding rawvideo RGBA64 and friends.Carl Eugen Hoyos2012-02-09
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-13 14:02:20 +0000