summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Cosmentics: Fix AVUI comment.Carl Eugen Hoyos2012-02-02
| | | | | | The codec contains no alpha information but deinterleaved interlaced video. Found by Maksym Veremeyenko.
* dvenc: use new public timecode API.Clément Bœsch2012-02-02
|
* mxfenc: use new public timecode API.Clément Bœsch2012-02-02
|
* gxfenc: use new public timecode API.Clément Bœsch2012-02-02
|
* dv: use new public timecode API.Clément Bœsch2012-02-02
|
* mov: honor tmcd flags while extracting timecode meta.Clément Bœsch2012-02-02
|
* mov: use new public timecode API.Clément Bœsch2012-02-02
|
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-02
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) frwu: Employ more meaningful return values. fraps: Use av_fast_padded_malloc() instead of av_realloc() mjpegdec: use av_fast_padded_malloc() eatqi: use av_fast_padded_malloc() asv1: use av_fast_padded_malloc() avcodec: Add av_fast_padded_malloc(). swscale: enable dithering in MMX functions. swscale: make rgb24 function macros slightly smaller. avcodec.h: Remove some disabled cruft. swscale: remove obsolete comment. swscale-test: Drop unused argc and argv arguments from main(). zmbv: Employ more meaningful return values. zmbvenc: Employ more meaningful return values. vc1: prevent null pointer dereference on broken files zmbv: check av_realloc() return values and avoid memleaks on ENOMEM truespeech: align buffer ac3: Do not read past the end of ff_ac3_band_start_tab. dv: Fix small stack overread related to CVE-2011-3929 and CVE-2011-3936. dv: Fix null pointer dereference due to ach=0 dv: check stype ... Conflicts: doc/APIchanges libavcodec/asv1.c libavcodec/avcodec.h libavcodec/eatqi.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/zmbv.c libavformat/dv.c libswscale/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dv: Fix small stack overread related to CVE-2011-3929 and CVE-2011-3936.Alex Converse2012-01-31
| | | | | | | | | | | | | | Found with asan. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * dv: Fix null pointer dereference due to ach=0Michael Niedermayer2012-01-31
| | | | | | | | | | | | | | | | | | | | | | dv: Fix null pointer dereference due to ach=0 Fixes part2 of CVE-2011-3929 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Reviewed-by: Roman Shaposhnik <roman@shaposhnik.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * dv: check stypeMichael Niedermayer2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | dv: check stype Fixes part1 of CVE-2011-3929 Possibly fixes part of CVE-2011-3936 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Reviewed-by: Roman Shaposhnik <roman@shaposhnik.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * swfdec: Simplify sample rate calculation.Alex Converse2012-01-31
| |
* | libavformat/avformat.h: fix stray libavformat referenceMichael Niedermayer2012-02-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | westwood_aud: Fix project referenceMichael Niedermayer2012-02-01
| | | | | | | | | | | | | | "Copyright (c) 2003 The ffmpeg Project" and "part of libav" is ROTFL Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) fate: add golomb-test golomb-test: K&R formatting cosmetics h264: Split h264-test off into a separate file - golomb-test.c. h264-test: cleanup: drop timer invocations, commented out code and other cruft h264-test: Remove unused DSP and AVCodec contexts and related init calls. adpcm: Add missing stdint.h #include to fix standalone header compilation. lavf: add functions for accessing the fourcc<->CodecID mapping tables. lavc: set AVCodecContext.codec in avcodec_get_context_defaults3(). lavc: make avcodec_close() work properly on unopened codecs. lavc: add avcodec_is_open(). lavf: rename AVInputFormat.value to raw_codec_id. lavf: remove the pointless value field from flv and iv8 lavc/lavf: remove unnecessary symbols from the symbol version script. lavc: reorder AVCodec fields. lavf: reorder AVInput/OutputFormat fields. mp3dec: Fix a heap-buffer-overflow adpcmenc: remove some unneeded casts adpcmenc: use int16_t and uint8_t instead of short and unsigned char. adpcmenc: fix adpcm_ms extradata allocation adpcmenc: return proper AVERROR codes instead of -1 ... Conflicts: doc/APIchanges libavcodec/Makefile libavcodec/adpcmenc.c libavcodec/avcodec.h libavcodec/h264.c libavcodec/libavcodec.v libavcodec/mpc7.c libavcodec/mpegaudiodec.c libavcodec/options.c libavformat/Makefile libavformat/avformat.h libavformat/flvdec.c libavformat/libavformat.v Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add functions for accessing the fourcc<->CodecID mapping tables.Anton Khirnov2012-01-31
| | | | | | | | Fixes bug 212.
| * lavc: set AVCodecContext.codec in avcodec_get_context_defaults3().Anton Khirnov2012-01-31
| | | | | | | | | | | | | | | | | | This way, if the AVCodecContext is allocated for a specific codec, the caller doesn't need to store this codec separately and then pass it again to avcodec_open2(). It also allows to set codec private options using av_opt_set_* before opening the codec.
| * lavc: add avcodec_is_open().Anton Khirnov2012-01-31
| | | | | | | | | | | | | | It allows to check whether an AVCodecContext is open in a documented way. Right now the undocumented way this check is done in lavf/lavc is by checking whether AVCodecContext.codec is NULL. However it's desirable to be able to set AVCodecContext.codec before avcodec_open2().
| * lavf: rename AVInputFormat.value to raw_codec_id.Anton Khirnov2012-01-31
| | | | | | | | It's only used by raw demuxers for storing the codec id.
| * lavf: remove the pointless value field from flv and iv8Anton Khirnov2012-01-31
| | | | | | | | The demuxers don't use it in any way.
| * lavc/lavf: remove unnecessary symbols from the symbol version script.Anton Khirnov2012-01-31
| |
| * lavf: reorder AVInput/OutputFormat fields.Anton Khirnov2012-01-31
| | | | | | | | | | | | | | Put all private fields at the end and mark them as such so they can be easily changed/removed. This breaks ABI.
| * movdec: Ignore sample_degradation_priority bits when checking first_sample_flagsMartin Storsjö2012-01-31
| | | | | | | | | | | | | | | | | | | | | | This makes the first packet of a track fragment run to get the keyframe flag set properly if sample_degradation_priority is nonzero. This makes the keyframes flag be set properly for ismv files created by Microsoft. Signed-off-by: Martin Storsjö <martin@martin.st>
| * flvdec: Interpret a toplevel 'object' type metadata item as normal metadata, tooMartin Storsjö2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | Previously, we've only passed the key string on to the recursive amf_parse_object for the mixedarray type, not for 'object'. By passing the key string on, the recursive amf_parse_object can store the amf objects as metadata. This kind of data was seen in data from XSplit Broadcaster, received over RTMP via Wowza. This patch allows reading this metadata. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (26 commits) avconv: deprecate the -deinterlace option doc: Fix the name of the new function aacenc: make sure to encode enough frames to cover all input samples. aacenc: only use the number of input samples provided by the user. wmadec: Verify bitstream size makes sense before calling init_get_bits. kmvc: Log into a context at a log level constant. mpeg12: Pad framerate tab to 16 entries. kgv1dec: Increase offsets array size so it is large enough. kmvc: Check palsize. nsvdec: Propagate errors nsvdec: Be more careful with av_malloc(). nsvdec: Fix use of uninitialized streams. movenc: cosmetics: Get rid of camelCase identifiers swscale: more generic check for planar destination formats with alpha doc: Document mov/mp4 fragmentation options build: Use order-only prerequisites for creating FATE reference file dirs. x86 dsputil: provide SSE2/SSSE3 versions of bswap_buf rtsp: Remove some unused variables from ff_rtsp_connect(). avutil: make intfloat api public avformat_write_header(): detail error message ... Conflicts: doc/APIchanges doc/ffmpeg.texi doc/muxers.texi ffmpeg.c libavcodec/kmvc.c libavcodec/x86/Makefile libavcodec/x86/dsputil_yasm.asm libavcodec/x86/pngdsp-init.c libavformat/movenc.c libavformat/movenc.h libavformat/mpegtsenc.c libavformat/nsvdec.c libavformat/utils.c libavutil/avutil.h libswscale/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nsvdec: Propagate errorsAlex Converse2012-01-30
| | | | | | | | | | | | Related to CVE-2011-3940. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
| * nsvdec: Be more careful with av_malloc().Alex Converse2012-01-30
| | | | | | | | | | | | | | | | | | | | Check results for av_malloc() and fix an overflow in one call. Related to CVE-2011-3940. Based in part on work from Michael Niedermayer. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
| * nsvdec: Fix use of uninitialized streams.Michael Niedermayer2012-01-30
| | | | | | | | | | | | | | | | | | | | Fixes CVE-2011-3940 (Out of bounds read resulting in out of bounds write) Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5c011706bc752d34bc6ada31d7df2ca0c9af7c6b) Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * movenc: cosmetics: Get rid of camelCase identifiersMartin Storsjö2012-01-30
| | | | | | | | | | | | | | Also add spacing around operators on touched lines, and split one line to match the common style. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: Remove some unused variables from ff_rtsp_connect().Diego Biurrun2012-01-30
| |
| * avformat_write_header(): detail error messageRafaël Carré2012-01-30
| | | | | | | | | | | | | | Give the exact aspect ratios when there is a mismatch between encoder and muxer. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * s/vbsf/bsf/Mike Melanson2012-01-30
| | | | | | | | | | | | | | -vbsf doesn't exist anymore. It got renamed to -bsf somewhere along the line. Update print statement accordingly. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * yuv4mpeg: allow YUV4MPEG2 demuxer to recognize 'C420' colorspace.Mike Melanson2012-01-30
| | | | | | | | | | | | | | | | | | | | Current demuxer recognizes several colorspace formats that begin with 'C420' but does not yet recognize plain 'C420'. GStreamer's y4menc component generates .y4m files with a 'C420' colorspace. This new comparison is placed after the other 'C420' checks so that it doesn't interfere with them. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avidec: print informative error messages if seeking fails.Michael Niedermayer2012-01-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3dec: fix truncating packet error message while decoding a complete MP3.Clément Bœsch2012-01-30
| | | | | | | | | | | | | | | | The MP3 demuxer split the data in packets of 1024B which are later split in MP3 frames by the MPEG audio parser. The last read is "truncated", but this should not raise any error. Solution-by: Michael Niedermayer
* | Cosmetics: Add bit per component information to v308 comment.Carl Eugen Hoyos2012-01-30
| |
* | Detect jps and pns files as (3D) jpg and png images.Martin Lambers2012-01-30
| |
* | bintext: use private options now that AVFormatParameters has been removedPeter Ross2012-01-29
| | | | | | | | | | Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: aacenc: Fix LONG_START windowing. aacenc: Fix a bug where deinterleaved samples were stored in the wrong place. avplay: use the correct array size for stride. lavc: extend doxy for avcodec_alloc_context3(). APIchanges: mention avcodec_alloc_context()/2/3 avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS. aacsbr: ARM NEON optimised sbrdsp functions aacsbr: align some arrays aacsbr: move some simdable loops to function pointers cosmetics: Remove extra newlines at EOF Conflicts: libavcodec/utils.c libavfilter/formats.c libavutil/mem.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Remove extra newlines at EOFAlex Converse2012-01-27
| |
* | Demux all parts of concatenated H.264.Reimar Döffinger2012-01-28
| | | | | | | | | | | | | | | | | | | | | | | | 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 <Reimar.Doeffinger@gmx.de>
* | Set AVFMT_TS_NONSTRICT for framecrc muxer.Reimar Döffinger2012-01-28
| | | | | | | | | | | | | | | | | | | | 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 <Reimar.Doeffinger@gmx.de>
* | Merge palette-only header with actual video frame.Reimar Döffinger2012-01-28
| | | | | | | | | | | | | | | | | | 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 <Reimar.Doeffinger@gmx.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <michaelni@gmx.at>
| * movenc: Allow writing to a non-seekable output if using empty moovMartin Storsjö2012-01-27
| | | | | | | | | | | | | | | | | | | | 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ö <martin@martin.st>
| * movenc: Support adding isml (smooth streaming live) metadataMartin Storsjö2012-01-27
| | | | | | | | | | | | | | This metadata is required for pushing a live stream to an IIS publishing point. Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavf: remove disabled FF_API_SET_PTS_INFO cruftAnton Khirnov2012-01-27
| |
| * lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruftAnton Khirnov2012-01-27
| |
| * lavf: remove disabled FF_API_REORDER_PRIVATE cruftAnton Khirnov2012-01-27
| |
| * lavf: remove disabled FF_API_SEEK_PUBLIC cruftAnton Khirnov2012-01-27
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-30 04:32:02 +0000