aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
...
| * mp3dec: Fix reading file size and frames in VBRI headersIngo Brückl2012-03-011-1/+1
| | | | | | | | | | | | | | | | 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-011-1/+1
| | | | | | | | 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-021-3/+3
| | | | | | | | | | | | | | | | | | 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-013-12/+108
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-013-12/+108
| | | | | | | | | | | | | | 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-0120-196/+601
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-291-0/+2
| |
| * psx-str: do not allow seeking by bytesJustin Ruggles2012-02-291-0/+1
| |
| * asfdec: Do not set AVCodecContext.frame_sizeJustin Ruggles2012-02-291-20/+0
| |
| * vqf: set packet parameters after av_new_packet()Justin Ruggles2012-02-291-3/+3
| | | | | | | | Otherwise the values are overwritten.
| * rtpenc: Fix setting the max packet sizeMartin Storsjö2012-02-291-1/+1
| | | | | | | | | | | | | | 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-291-1/+1
| | | | | | | | support.
| * mp3enc: write attached pictures (APIC).Anton Khirnov2012-02-291-7/+113
| |
| * mp3enc: move mp3_write_xing() further up in the file.Anton Khirnov2012-02-291-45/+49
| | | | | | | | It will be need by new functions called from mp3_write_trailer().
| * id3v2enc: add a function for writing attached pictures.Anton Khirnov2012-02-292-9/+87
| | | | | | | | Unused so far.
| * id3v2enc: fix writing frame sizes for ID3v2.3Anton Khirnov2012-02-291-11/+15
| | | | | | | | | | | | | | 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-294-26/+68
| | | | | | | | | | 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-291-7/+7
| | | | | | | | It has no need of full AVFormatContext.
| * id3v2: remove unused ff_id3v2_read().Anton Khirnov2012-02-294-15/+5
| | | | | | | | Rename ff_id3v2_read_all to ff_id3v2_read().
| * lavf: export id3v2 attached pictures as streams.Anton Khirnov2012-02-293-1/+48
| |
| * lavf: generic code for exporting attached pictures.Anton Khirnov2012-02-292-18/+44
| |
| * id3v2: read attached pictures and export them in ID3v2ExtraMeta.Anton Khirnov2012-02-292-0/+125
| |
| * lavf: move CodecMime from matroska.h to internal.hAnton Khirnov2012-02-292-5/+6
| | | | | | | | it will be useful for attached pictures in ID3v2
| * swfdec: do not set codec timebase.Anton Khirnov2012-02-291-2/+0
| | | | | | | | | | | | 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-291-3/+4
| | | | | | | | | | 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-292-4/+0
| | | | | | | | Deprecate corresponding AVCodecContext fields.
| * asf: don't seek back on EOF.Ronald S. Bultje2012-02-281-1/+1
| | | | | | | | | | | | | | | | | | 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-281-1/+5
| | | | | | | | | | | | | | 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-295-52/+56
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-281-1/+1
| | | | | | | | | | 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-283-7/+2
| |
| * segment: implement wrap aroundLuca Barbato2012-02-281-2/+6
| | | | | | | | | | | | | | | | 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-281-34/+38
| |
* | mxfdec: set pixel format for cdci picture formatsPhilip de Nier2012-02-283-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-281-0/+1
| | | | | | | | | | | | | | | | | | 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-281-0/+1
| | | | | | | | | | 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-281-2/+2
| | | | | | | | | | | | | | 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-281-1/+1
| | | | | | | | | | | | | | | | 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-281-2/+2
| | | | | | | | | | 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-281-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pmpdec: Check for zero audio packets.Michael Niedermayer2012-02-281-0/+4
| | | | | | | | | | | | | | This fixes a division by 0. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-283-28/+144
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avcodec_default_reget_buffer(): fix compilation in DEBUG mode fate: Overhaul WavPack coverage h264: fix mmxext chroma deblock to use correct TC values. flvdec: Remove the now redundant check for known broken metadata creator flvdec: Validate index entries added from metadata while reading rtsp: Handle requests from server to client movenc: use timestamps instead of frame_size for samples-per-packet movenc: use the first cluster duration as the tfhd default duration movenc: factorize calculation of cluster duration into a separate function doc/APIchanges: fill in missing dates and hashes. lavc: reorder AVCodecContext fields. lavc: reorder AVFrame fields. Conflicts: doc/APIchanges libavcodec/avcodec.h libavformat/flvdec.c libavformat/movenc.c tests/fate/lossless-audio.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: Remove the now redundant check for known broken metadata creatorMichael Niedermayer2012-02-271-12/+0
| | | | | | | | | | | | The index validation identifies these indexes as broken. Signed-off-by: Martin Storsjö <martin@martin.st>
| * flvdec: Validate index entries added from metadata while readingMartin Storsjö2012-02-271-3/+52
| | | | | | | | | | | | | | | | | | | | | | By validating the index entries while reading, we don't need to seek at startup to validate the entries. If the error in the index entries is not pointing to (our definition of) the start of packets, and there is an index entry pointing at some of the first packets after the metadata, the invalid index can be discarded almost immediately. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: Handle requests from server to clientTommy Winther2012-02-271-5/+53
| | | | | | | | | | | | | | | | | | | | | | | | This returns 200 OK for OPTIONS requests and 501 Not Implemented for all other requests. Even though this doesn't do much actual handling of the requests, it makes the code properly identify server requests as such, instead of interpreting it as a reply to the client's request as it did before. Signed-off-by: Martin Storsjö <martin@martin.st>
| * movenc: use timestamps instead of frame_size for samples-per-packetJustin Ruggles2012-02-271-5/+20
| | | | | | | | | | | | For encoding, AVCodecContext.frame_size is the number of input samples to send to the encoder and does not necessarily correspond directly to the timestamps of the output packets.
| * movenc: use the first cluster duration as the tfhd default durationJustin Ruggles2012-02-271-1/+1
| |
| * movenc: factorize calculation of cluster duration into a separate functionJustin Ruggles2012-02-271-11/+18
| |
| * lavf: don't guess r_frame_rate from either stream or codec timebase.Anton Khirnov2012-02-261-11/+0
| | | | | | | | | | | | | | Neither of those is guaranteed to be connected to framerate in any way (if it even exists). Fixes bug 56.
| * lavf: don't set codec timebase in avformat_find_stream_info().Anton Khirnov2012-02-261-7/+0
| | | | | | | | It's not supposed to be set outside of lavc.