summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-03
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) amrwb: remove duplicate arguments from extrapolate_isf(). amrwb: error out early if mode is invalid. h264: change underread for 10bit QPEL to overread. matroska: check buffer size for RM-style byte reordering. vp8: disable mmx functions with sse/sse2 counterparts on x86-64. vp8: change int stride to ptrdiff_t stride. wma: fix invalid buffer size assumptions causing random overreads. Windows Media Audio Lossless decoder rv10/20: Fix slice overflow with checked bitstream reader. h263dec: Disallow width/height changing with frame threads. rv10/20: Fix a buffer overread caused by losing track of the remaining buffer size. rmdec: Honor .RMF tag size rather than assuming 18. g722: Fix the QMF scaling r3d: don't set codec timebase. electronicarts: set timebase for tgv video. electronicarts: parse the framerate for cmv video. ogg: don't set codec timebase electronicarts: don't set codec timebase avs: don't set codec timebase wavpack: Fix an integer overflow ... Conflicts: libavcodec/arm/vp8dsp_init_arm.c libavcodec/fraps.c libavcodec/h264.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/msmpeg4.c libavcodec/pnmdec.c libavcodec/qpeg.c libavcodec/rawenc.c libavcodec/ulti.c libavcodec/vcr1.c libavcodec/version.h libavcodec/wmalosslessdec.c libavformat/electronicarts.c libswscale/ppc/yuv2rgb_altivec.c tests/ref/acodec/g722 tests/ref/fate/ea-cmv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroska: check buffer size for RM-style byte reordering.Ronald S. Bultje2012-03-02
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * rmdec: Honor .RMF tag size rather than assuming 18.Alex Converse2012-03-02
| |
| * r3d: don't set codec timebase.Anton Khirnov2012-03-02
| | | | | | | | | | | | It's not supposed to be set by demuxers. Set avg_frame_rate and r_frame_rate instead.
| * electronicarts: set timebase for tgv video.Anton Khirnov2012-03-02
| | | | | | | | | | | | | | | | The container has no timestamps and the framerate isn't stored in the data either. The decoder sets codec timebase to experimentally found value 1/15. Do the same for the demuxer too, it should at least be better than the default 1/90000.
| * electronicarts: parse the framerate for cmv video.Anton Khirnov2012-03-02
| |
| * ogg: don't set codec timebaseAnton Khirnov2012-03-02
| | | | | | | | Demuxers are not supposed to set it.
| * electronicarts: don't set codec timebaseAnton Khirnov2012-03-02
| | | | | | | | | | | | Demuxers are not supposed to set it. Set stream timebase and framerates instead (this is a cfr container with no timestamps).
| * avs: don't set codec timebaseAnton Khirnov2012-03-02
| | | | | | | | | | Demuxers are not supposed to set it. Set r_frame_rate and avg_frame_rate instead.
| * mp3dec: Fix reading file size and frames in VBRI headersIngo Brückl2012-03-01
| | | | | | | | | | | | | | | | The fields "Number of Bytes" and "Number of Frames" are mixed up. "Bytes" come first, "Frames" behind. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * rmdec: adjust printf format string specifier to fix warningDiego Biurrun2012-03-01
| | | | | | | | libavformat/rmdec.c:383: warning: format ‘%d’ expects type ‘int’, but argument 7 has type ‘int64_t’
* | lavf: fix update_initial_durations() so it handles missing durations with ↵Michael Niedermayer2012-03-02
| | | | | | | | | | | | | | | | | | the initial timestamp being known. This fixes duplicate timestamps on mp2 in ts with non seekable input. It also fixed the fate pva demux timestamps. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: error out on invalid bitdepth. aacsbr: use a swap index for the Y matrix rather than copy buffers. huffyuv: do not abort on unknown pix_fmt; instead, return an error. lcl: return negative error codes on decode_init() errors. rtpenc: Use MB info side data for splitting H263 packets for RFC 2190 h263enc: Add an option for outputting info about MBs as side data avpacket: Add a function for shrinking already allocated side data nellymoserdec: Saner and faster IMDCT windowing Conflicts: doc/APIchanges libavcodec/avpacket.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Use MB info side data for splitting H263 packets for RFC 2190Martin Storsjö2012-03-01
| | | | | | | | | | | | | | This makes the packetization spec compliant for cases where one single GOB doesn't fit into an RTP packet. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (58 commits) amrnbdec: check frame size before decoding. cscd: use negative error values to indicate decode_init() failures. h264: prevent overreads in intra PCM decoding. FATE: do not decode audio in the nuv test. dxa: set audio stream time base using the sample rate psx-str: do not allow seeking by bytes asfdec: Do not set AVCodecContext.frame_size vqf: set packet parameters after av_new_packet() mpegaudiodec: use DSPUtil.butterflies_float(). FATE: add mp3 test for sample that exhibited false overreads fate: add cdxl test for bit line plane arrangement vmnc: return error on decode_init() failure. libvorbis: add/update error messages libvorbis: use AVFifoBuffer for output packet buffer libvorbis: remove unneeded e_o_s check libvorbis: check return values for functions that can return errors libvorbis: use float input instead of s16 libvorbis: do not flush libvorbis analysis if dsp state was not initialized libvorbis: use VBR by default, with default quality of 3 libvorbis: fix use of minrate/maxrate AVOptions ... Conflicts: Changelog doc/APIchanges libavcodec/avcodec.h libavcodec/dpxenc.c libavcodec/libvorbis.c libavcodec/vmnc.c libavformat/asfdec.c libavformat/id3v2enc.c libavformat/internal.h libavformat/mp3enc.c libavformat/utils.c libavformat/version.h libswscale/utils.c tests/fate/video.mak tests/ref/fate/nuv tests/ref/fate/prores-alpha tests/ref/lavf/ffm tests/ref/vsynth1/prores tests/ref/vsynth2/prores Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dxa: set audio stream time base using the sample rateJustin Ruggles2012-02-29
| |
| * psx-str: do not allow seeking by bytesJustin Ruggles2012-02-29
| |
| * asfdec: Do not set AVCodecContext.frame_sizeJustin Ruggles2012-02-29
| |
| * vqf: set packet parameters after av_new_packet()Justin Ruggles2012-02-29
| | | | | | | | Otherwise the values are overwritten.
| * rtpenc: Fix setting the max packet sizeMartin Storsjö2012-02-29
| | | | | | | | | | | | | | This fixes cases where the user had specified one desired MTU via an option, and the protocol indicates another one. Signed-off-by: Martin Storsjö <martin@martin.st>
| * Add a minor bump, changelog/APIchanges entry and some documentation for APIC ↵Anton Khirnov2012-02-29
| | | | | | | | support.
| * mp3enc: write attached pictures (APIC).Anton Khirnov2012-02-29
| |
| * mp3enc: move mp3_write_xing() further up in the file.Anton Khirnov2012-02-29
| | | | | | | | It will be need by new functions called from mp3_write_trailer().
| * id3v2enc: add a function for writing attached pictures.Anton Khirnov2012-02-29
| | | | | | | | Unused so far.
| * id3v2enc: fix writing frame sizes for ID3v2.3Anton Khirnov2012-02-29
| | | | | | | | | | | | | | Frame sizes in ID3v2.3 are not synchsafe, they are simply 32be numbers. In practice this bug is not noticeable unless the frame size takes more than 7 bits (which is almost never for text frames).
| * id3v2enc: split ff_id3v2_write().Anton Khirnov2012-02-29
| | | | | | | | | | This will allow writing the tag in several steps, needed for writing attached pictures.
| * id3v2enc: make id3v2_put_size take only an AVIOContext.Anton Khirnov2012-02-29
| | | | | | | | It has no need of full AVFormatContext.
| * id3v2: remove unused ff_id3v2_read().Anton Khirnov2012-02-29
| | | | | | | | Rename ff_id3v2_read_all to ff_id3v2_read().
| * lavf: export id3v2 attached pictures as streams.Anton Khirnov2012-02-29
| |
| * lavf: generic code for exporting attached pictures.Anton Khirnov2012-02-29
| |
| * id3v2: read attached pictures and export them in ID3v2ExtraMeta.Anton Khirnov2012-02-29
| |
| * lavf: move CodecMime from matroska.h to internal.hAnton Khirnov2012-02-29
| | | | | | | | it will be useful for attached pictures in ID3v2
| * swfdec: do not set codec timebase.Anton Khirnov2012-02-29
| | | | | | | | | | | | It is not supposed to be set outside of lavc. Fixes a divide by zero when the stored framerate is 0.
| * lavc: deprecate AVCodecContext.color_table_id.Anton Khirnov2012-02-29
| | | | | | | | | | It's currently only used as temporary storage by the mov demuxer. Make it use a local variable instead.
| * mpegvideo_enc: add chroma/luma_elim_threshold private options.Anton Khirnov2012-02-29
| | | | | | | | Deprecate corresponding AVCodecContext fields.
| * asf: don't seek back on EOF.Ronald S. Bultje2012-02-28
| | | | | | | | | | | | | | | | | | Seeking back on EOF will reset the EOF flag, causing us to re-enter the loop to find the next marker in the ASF file, thus potentially causing an infinite loop. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * asf: error out on ridiculously large minpktsize values.Ronald S. Bultje2012-02-28
| | | | | | | | | | | | | | They cause various issues further down in demuxing. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: adpcm: Clip step_index values read from the bitstream at the beginning of each frame. oma: don't read beyond end of leaf_table. doxygen: Remove documentation for non-existing parameters; misc small fixes. Indeo3: fix crashes on corrupt bitstreams. msmpeg4: Replace forward declaration by proper #include. segment: implement wrap around avf: reorder AVStream and AVFormatContext aacdec: Remove erroneous reference to global gain from the out of bounds scalefactor error message. Conflicts: libavcodec/indeo3.c libavformat/avformat.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oma: don't read beyond end of leaf_table.Ronald S. Bultje2012-02-28
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * doxygen: Remove documentation for non-existing parameters; misc small fixes.Diego Biurrun2012-02-28
| |
| * segment: implement wrap aroundLuca Barbato2012-02-28
| | | | | | | | | | | | | | | | Provide a way to wrap around the segment index so pseudostreaming live through a web server and html5 browser is simpler. Also ensure that 0 (disable) is a valid value across the options providing wrap around.
| * avf: reorder AVStream and AVFormatContextLuca Barbato2012-02-28
| |
* | mxfdec: set pixel format for cdci picture formatsPhilip de Nier2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The properties of the CDCI Descriptor are insufficient to specify the pixel format for uncompressed picture data. SMPTE 377-1 and RP224v10 have defined a set of picture coding labels to indicate what formatting was used. This patch uses 2 labels to detect UYVY422 or YUYV422 pixel formats. It defaults to UYVY422 for 8-bit 4:2:2 pictures to support files that were created before the coding labels were introduced ~2008 The codec pix_fmt default was changed from 0 (PIX_FMT_YUV420P) to -1 (PIX_FMT_NONE) Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: detect uncomp pictures using essence container ulPhilip de Nier2012-02-28
| | | | | | | | | | | | | | | | | | This supports detection of uncompressed picture in files that didn't include a Picture Coding Label. The lables weren't available until SMPTE 377-1 and RP224v10 Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxf: add uncompressed 422 8-bit rawvideo labelPhilip de Nier2012-02-28
| | | | | | | | | | Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: set track edit rate num/den in expected orderPhilip de Nier2012-02-28
| | | | | | | | | | | | | | This matches the order used for the index table edit rate. Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxf: fix v210 label matching lenPhilip de Nier2012-02-28
| | | | | | | | | | | | | | | | Must check all 16 bytes because there is a planar 10-bit format label that has equal first 15 bytes Review-by: Baptiste Coudurier <baptiste.coudurier@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | omadec: Fix wrong number of array elements.Michael Niedermayer2012-02-28
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | add v210 to intra only list to allow "-vcodec copy"Philip de Nier2012-02-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pmpdec: Check for zero audio packets.Michael Niedermayer2012-02-28
| | | | | | | | | | | | | | This fixes a division by 0. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>