summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-02
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (25 commits) rtpenc: Add support for G726 audio rtpdec: Interpret the different G726 names as bits_per_coded_sample rtpenc: Change rtp_send_samples to handle sample sizes other than even bytes rtpenc: Cast a rescaling parameter to int64_t h264: cap max has_b_frames at MAX_DELAYED_PIC_COUNT - 1. ARM: fix indentation in ff_dsputil_init_neon() ARM: NEON put/avg_pixels8/16 cosmetics ARM: add remaining NEON avg_pixels8/16 functions ARM: clean up NEON put/avg_pixels macros fate: split acodec-pcm into individual tests swscale: #include "libavutil/mathematics.h" pmpdec: don't use deprecated av_set_pts_info. rv34: align temporary block of "dct" coefs Add PlayStation Portable PMP format demuxer proto: Realign struct initializers proto: Use .priv_data_size to allocate the private context mmsh: Properly clean up if the second ffurl_alloc failed rtmp: Clean up properly if the handshake failed md5proto: Remove the get_file_handle function applehttpproto: Use the close function if the open function fails ... Conflicts: libavcodec/vble.c libavformat/mmsh.c libavformat/pmpdec.c libavformat/udp.c tests/ref/acodec/pcm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Add support for G726 audioMartin Storsjö2011-12-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpdec: Interpret the different G726 names as bits_per_coded_sampleMartin Storsjö2011-12-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For the standardized 8 kHz sample rate, this works exactly the same. For nonstandard sample rates, the different predefined G726 names (G726-16, G726-24, G726-32, G726-40) are interpreted as an indication of the bits per coded sample, even though their actual bitrates aren't what the name specifies. This feels more sane than using free-form names for nonstandard sample rate/bitrate combinations, e.g like G726-22, G726-33 for 11025 Hz. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpenc: Change rtp_send_samples to handle sample sizes other than even bytesMartin Storsjö2011-12-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpenc: Cast a rescaling parameter to int64_tMartin Storsjö2011-12-01
| | | | | | | | | | | | | | This avoids overflow if frame_size is over 2147, since both frame_size and AV_TIME_BASE are plain integers. Signed-off-by: Martin Storsjö <martin@martin.st>
| * pmpdec: don't use deprecated av_set_pts_info.Anton Khirnov2011-12-01
| |
| * Add PlayStation Portable PMP format demuxerReimar Döffinger2011-12-01
| | | | | | | | | | | | | | | | | | Not yet complete, for demuxing AAC the AAC header must be generated manually. Possibly the decoder could accept the header as extradata to simplify this. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * proto: Realign struct initializersMartin Storsjö2011-12-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * proto: Use .priv_data_size to allocate the private contextMartin Storsjö2011-12-01
| | | | | | | | | | | | | | | | This simplifies the open functions by avoiding one function call that needs error checking, reducing the amount of extra bulk code. Signed-off-by: Martin Storsjö <martin@martin.st>
| * mmsh: Properly clean up if the second ffurl_alloc failedMartin Storsjö2011-12-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtmp: Clean up properly if the handshake failedMartin Storsjö2011-12-01
| | | | | | | | | | | | This prevents memory leaks if this function returns an error. Signed-off-by: Martin Storsjö <martin@martin.st>
| * md5proto: Remove the get_file_handle functionMartin Storsjö2011-12-01
| | | | | | | | | | | | | | The private data pointer isn't a file handle, this protocol doesn't have any file handle to return. Signed-off-by: Martin Storsjö <martin@martin.st>
| * applehttpproto: Use the close function if the open function failsMartin Storsjö2011-12-01
| | | | | | | | | | | | This should clean up leaked memory. Signed-off-by: Martin Storsjö <martin@martin.st>
| * http: Make sure proxyauth is initializedMartin Storsjö2011-12-01
| | | | | | | | | | | | | | | | | | This string will be passed to ff_http_auth_create_response even if no proxy is used, resulting in reading uninitialized memory. The other auth string is always initialized by av_url_split. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Fix id3v2 extended header handling.Adrian Drzewiecki2011-12-01
| | | | | | | | | | | | | | | | When skipping over the extended header, take into account that the size field has already been read. The extended header also takes up space, so adjust total header length accordingly. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: allow grouping packets in chunks of a user specified size and duration.Michael Niedermayer2011-12-01
| | | | | | | | | | | | This is similar to MP4Boxs -inter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add audio_preload option, this allows interleaving audio earlierMichael Niedermayer2011-12-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtpdec: Templatize the code for different g726 bitrate variants rv40: move loop filter to rv34dsp context lavf: make av_set_pts_info private. rtpdec: Add support for G726 audio rtpdec: Add an init function that can do custom codec context initialization avconv: make copy_tb on by default. matroskadec: don't set codec timebase. rmdec: don't set codec timebase. avconv: compute next_pts from input packet duration when possible. lavf: estimate frame duration from r_frame_rate. avconv: update InputStream.pts in the streamcopy case. Conflicts: avconv.c libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/fbdev.c libavdevice/libdc1394.c libavdevice/oss_audio.c libavdevice/v4l.c libavdevice/v4l2.c libavdevice/vfwcap.c libavdevice/x11grab.c libavformat/au.c libavformat/eacdata.c libavformat/flvdec.c libavformat/mpegts.c libavformat/mxfenc.c libavformat/rtpdec_g726.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Templatize the code for different g726 bitrate variantsMartin Storsjö2011-11-30
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavf: make av_set_pts_info private.Anton Khirnov2011-11-30
| | | | | | | | It's supposed to be called only from (de)muxers.
| * rtpdec: Add support for G726 audioMiroslav Slugeň2011-11-30
| | | | | | | | | | | | | | | | | | | | | | This requires using a separate init function, since there isn't necessarily any fmtp lines for this codec, so parse_sdp_a_line won't be called. Incorporating it with the alloc function wouldn't do either, since it is called before the full rtpmap line is parsed (where the sample rate is extracted). Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpdec: Add an init function that can do custom codec context initializationMartin Storsjö2011-11-30
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * matroskadec: don't set codec timebase.Anton Khirnov2011-11-30
| | | | | | | | It's not supposed to be set outside of lavc.
| * rmdec: don't set codec timebase.Anton Khirnov2011-11-30
| | | | | | | | | | It's not supposed to be set outside of lavc. Set r_frame_rate instead.
| * lavf: estimate frame duration from r_frame_rate.Anton Khirnov2011-11-30
| | | | | | | | | | If r_frame_rate is set, it should be more reliable for this than either codec or stream timebase.
* | movenc: replace cluster memset by zeroing only the needed field.Michael Niedermayer2011-11-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | flvdemux: export flags for nellymoser through side data.Michael Niedermayer2011-11-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ac3probe: Change threshold from 500 to 200 to keep in sync with mp3.Michael Niedermayer2011-11-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3probe: Detect mp3 stronger with just 200 frames, this should speed up ↵Michael Niedermayer2011-11-30
| | | | | | | | | | | | | | | | detection on mp3 streams. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movenc: memset(0) new cluster elements after realloc()Michael Niedermayer2011-11-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix typeo in some rarely used memoizationJoseph Wecker2011-11-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | removes spurious warningJoseph Wecker2011-11-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movenc: Remove unneeded chunkSize field from MOVIentryGeek.Song2011-11-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movenc: Write file with minimal number of chunks for the given interleaving.Michael Niedermayer2011-11-29
| | | | | | | | | | Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: adtsenc: Check frame size. txd: Fix order of operations. APIchanges: fill in some blanks timer: fix misspelling of "decicycles" Eliminate pointless 0/NULL initializers in AVCodec and similar declarations. indeo3: cosmetics md5proto: Fix order of operations. dca: Replace oversized unused get_bits() with skip_bits_long(). Conflicts: doc/APIchanges libavformat/mmsh.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adtsenc: Check frame size.Alex Converse2011-11-28
| | | | | | | | | | | | Inspired by work from: Michael Niedermayer <michaelni@gmx.at>. Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * Eliminate pointless 0/NULL initializers in AVCodec and similar declarations.Diego Biurrun2011-11-28
| |
| * md5proto: Fix order of operations.Alex Converse2011-11-27
| |
* | sdp: Fix null pointer dereference with aac and ffserver.Carl2011-11-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vc1: use an enum for Frame Coding Mode doc: cleanup filter section indeo3: error out if no motion vector is set. x86inc: Flag shufps as an floating-point instruction for the AVX emulation code. mpegaudio: do not use init_static_data() for initializing tables. musepack: fix signed shift overflow in mpc_read_packet() mov: Make format string match variable type. wmavoice: Make format string match variable type. vc1: select interlaced scan table by FCM element Generalize RIFF INFO tag support; support reading INFO tag in wav pthread: track thread existence in a separate variable. Conflicts: doc/filters.texi libavcodec/pthread.c libavformat/avi.c libavformat/riff.c libavformat/riff.h libavformat/wav.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * musepack: fix signed shift overflow in mpc_read_packet()Mans Rullgard2011-11-27
| | | | | | | | | | | | | | Using an unsigned variable avoids problems with overflows. There is further no need for a 64-bit intermediate here. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mov: Make format string match variable type.Alex Converse2011-11-26
| |
| * Generalize RIFF INFO tag support; support reading INFO tag in wavVictor Vasiliev2011-11-26
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | img2: update first file only when -updatefirst is specifiedMichael Niedermayer2011-11-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tta: better check for totalframes.Michael Niedermayer2011-11-27
| | | | | | | | | | | | Avoids crash, Fixes Ticket 690 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | img2: Allow writing multiple files onto the same output file.Michael Niedermayer2011-11-27
| | | | | | | | | | | | Fixes Ticket687 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (42 commits) swscale: fix signed overflow in yuv2mono_X_c_template snow: fix integer overflows svq1enc: remove stale altivec-related hack snow: fix signed overflow in byte to 32-bit replication adx: rename ff_adx_decode_header() to avpriv_adx_decode_header() avformat: add CRI ADX format demuxer adx: add an ADX parser. adx: move header decoding to ADX common code adx: calculate the number of blocks in a packet adx: define and use 2 new macro constants BLOCK_SIZE and BLOCK_SAMPLES adx: check for unsupported ADX formats adx: simplify encoding by using put_sbits() adx: calculate correct LPC coeffs adx: use 12-bit coefficients instead of 14-bit to avoid integer overflow adx: simplify adx_decode() by using get_sbits() to read residual samples adx: fix the data offset parsing in adx_decode_header() adx: remove unneeded post-decode channel interleaving adx: validate header values adx: cosmetics: general pretty-printing and comment clean-up adx: remove useless comments ... Conflicts: Changelog libavcodec/cook.c libavcodec/fraps.c libavcodec/nuv.c libavcodec/pthread.c libavcodec/version.h libavformat/Makefile libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adx: rename ff_adx_decode_header() to avpriv_adx_decode_header()Justin Ruggles2011-11-26
| | | | | | | | | | It is used by the ADX decoder, and therefore needs to be exported in order to work with shared libs.
| * avformat: add CRI ADX format demuxerJustin Ruggles2011-11-26
| |
| * adx: add an ADX parser.Justin Ruggles2011-11-26
| | | | | | | | | | | | This simplifies the decoder so it doesn't have to process an in-packet header or handle arbitrary-sized packets. It also fixes decoding of files with large headers.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-15 16:58:58 +0000