summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-14
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: pass options from AVFormatContext to avio. avformat: Use avio_open2, pass the AVFormatContext interrupt_callback onwards avio: add avio_open2, taking an interrupt callback and options avio: add support for passing options to protocols. avio: add and use ffurl_protocol_next(). avformat: Pass the interrupt callback on to chained muxers/demuxers avio: Add an AVIOInterruptCB parameter to ffurl_open/ffurl_alloc avformat: Use ff_check_interrupt avio: Add an internal utility function for checking the new interrupt callback avio: Add AVIOInterruptCB texi2html: remove stray \n doc: prettyfy the texi2html documentation swscale: handle unaligned buffers in yuv2plane1 Conflicts: libavformat/avformat.h libavformat/avio.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: pass options from AVFormatContext to avio.Anton Khirnov2011-11-13
| |
| * avformat: Use avio_open2, pass the AVFormatContext interrupt_callback onwardsMartin Storsjö2011-11-13
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * avio: add avio_open2, taking an interrupt callback and optionsMartin Storsjö2011-11-13
| | | | | | | | | | | | | | | | | | | | | | The interrupt callback has to be passed in during opening (setting it after opening isn't enough), since a blocking open couldn't be interrupted otherwise. Options are passed down to procotols and also need to be available during open() in most cases. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * avio: add support for passing options to protocols.Anton Khirnov2011-11-13
| | | | | | | | | | Not used anywhere yet, support for passing options from avio_open() will follow.
| * avio: add and use ffurl_protocol_next().Anton Khirnov2011-11-13
| |
| * avformat: Pass the interrupt callback on to chained muxers/demuxersMartin Storsjö2011-11-13
| | | | | | | | | | | | There are a few more cases of chained demuxers, but they only use custom IO which don't do any blocking IO and thus don't need the callback.
| * avio: Add an AVIOInterruptCB parameter to ffurl_open/ffurl_allocMartin Storsjö2011-11-13
| | | | | | | | | | Change all uses of these function to pass the relevant callback on.
| * avformat: Use ff_check_interruptMartin Storsjö2011-11-13
| |
| * avio: Add an internal utility function for checking the new interrupt callbackMartin Storsjö2011-11-13
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * avio: Add AVIOInterruptCBMartin Storsjö2011-11-13
| | | | | | | | | | | | | | | | | | | | | | | | | | This is a better io interrupt callback function, which has an opaque parameter, which is given to the interrupt callback. This allows callers to precisely cancel IO for one single AVFormatContext, without interrupt other ones in the same process. Note, it's not needed in AVIOContext, at the moment. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | mkvtimestamp v2 muxer: rename so as to avoid confusion with SMPTE timecodes.Michael Niedermayer2011-11-13
| | | | | | | | | | | | Requested-by: Baptiste Coudurier Approved-by: David Conrad Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mkvtimestamp v2 muxer: remove unneeded prefixesMichael Niedermayer2011-11-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vble: remove vble_error_close VBLE Decoder tta: use an integer instead of a pointer to iterate output samples shorten: do not modify samples pointer when interleaving mpc7: only support stereo input. dpcm: do not try to decode empty packets dpcm: remove unneeded buf_size==0 check. twinvq: add SSE/AVX optimized sum/difference stereo interleaving vqf/twinvq: pass vqf COMM chunk info in extradata vqf: do not set bits_per_coded_sample for TwinVQ. twinvq: check for allocation failure in init_mdct_win() swscale: add padding to conversion buffer. rtpdec: Simplify finalize_packet http: Handle proxy authentication http: Print an error message for Authorization Required, too AVOptions: don't return an invalid option when option list is empty AIFF: add 'twos' FourCC for the mux/demuxer (big endian PCM audio) Conflicts: libavcodec/avcodec.h libavcodec/tta.c libavcodec/vble.c libavcodec/version.h libavutil/opt.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * VBLE DecoderDerek Buitenhuis2011-11-11
| | | | | | | | | | | | | | | | | | Add a decoder for the VBLE Lossless Codec, which still has a cult following. Used to be popular several years ago on doom9. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
| * vqf/twinvq: pass vqf COMM chunk info in extradataJustin Ruggles2011-11-11
| | | | | | | | | | | | This is needed because the twinvq decoder cannot rely on bit_rate to be set. The API documentation says that bit_rate is set by libavcodec, not by the user.
| * vqf: do not set bits_per_coded_sample for TwinVQ.Justin Ruggles2011-11-11
| | | | | | | | | | It is a lossy codec with varying quantization, so bits_per_coded_sample is not applicable.
| * rtpdec: Simplify finalize_packetJohn Brooks2011-11-11
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * http: Handle proxy authenticationMartin Storsjö2011-11-11
| | | | | | | | | | | | | | | | Tested with both Basic and Digest authentication, and tested with both proxy authentication and authentication for the requested resource at the same time. Signed-off-by: Martin Storsjö <martin@martin.st>
| * http: Print an error message for Authorization Required, tooMartin Storsjö2011-11-11
| | | | | | | | | | | | | | | | | | | | | | The error was hidden before, to avoid showing an error on the first request where no auth has been provided, when the server indicates which authentication method to use. Now the error is printed if an authentication method was used, but failed. Signed-off-by: Martin Storsjö <martin@martin.st>
| * AIFF: add 'twos' FourCC for the mux/demuxer (big endian PCM audio)Mike Melanson2011-11-11
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | VBLE DecoderDerek Buitenhuis2011-11-12
| | | | | | | | | | | | | | | | | | Add a decoder for the VBLE Lossless Codec, which still has a cult following. Used to be popular several years ago on doom9. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Use AC-3 as default codec for wtv.Carl Eugen Hoyos2011-11-12
| |
* | Never use MP3 as default audio codec for asf.ami_stuff2011-11-11
| | | | | | | | Some Windows versions do not ship an appropriate MP3 decoder.
* | asfenc: Use wmav2 audio codec by default.ami_stuff2011-11-11
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) doc: update libavfilter documentation tls: Use the URLContext as logging context aes: Avoid illegal read and don't generate more key than we use. mpc7: Fix memset call in mpc7_decode_frame function atrac1: use correct context for av_log() apedec: consume the whole packet when copying to the decoder buffer. apedec: do not needlessly copy s->samples to nblocks. apedec: check output buffer size after calculating actual output size apedec: remove unneeded entropy decoder normalization. truespeech: use memmove() in truespeech_update_filters() vorbisdec: remove AVCODEC_MAX_AUDIO_FRAME_SIZE check vorbisdec: remove unneeded buf_size==0 check vorbisdec: return proper error codes instead of made-up ones http: Don't add a Range: bytes=0- header for POST sunrast: Check for invalid/corrupted bitstream http: Change the chunksize AVOption into chunked_post http: Add encoding/decoding flags to the AVOptions avconv: remove some codec-specific hacks crypto: add decoding flag to options. tls: use AVIO_FLAG_NONBLOCK instead of deprecated URL_FLAG_NONBLOCK ... Conflicts: doc/libavfilter.texi libavcodec/atrac1.c libavcodec/sunrast.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tls: Use the URLContext as logging contextMartin Storsjö2011-11-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * http: Don't add a Range: bytes=0- header for POSTMartin Storsjö2011-11-10
| | | | | | | | | | | | That header simply doesn't make sense in that context. Signed-off-by: Martin Storsjö <martin@martin.st>
| * http: Change the chunksize AVOption into chunked_postMartin Storsjö2011-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The chunksize internal variable has two different uses - for reading, it's the amount of data left of the current chunk (or -1 if the server doesn't send data in chunked mode), where it's only an internal state variable. For writing, it's used to decide whether to enable chunked encoding (by default), by using the value 0, or disable chunked encoding (value -1). This, while consistent, doesn't make much sense to expose as an AVOption. This splits the usage of the internal variable into two variables, chunksize which is used for reading (as before), and chunked_post which is the user-settable option, with the values 0 and 1, where 1 is default. Signed-off-by: Martin Storsjö <martin@martin.st>
| * http: Add encoding/decoding flags to the AVOptionsAnton Khirnov2011-11-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * crypto: add decoding flag to options.Anton Khirnov2011-11-10
| |
| * tls: use AVIO_FLAG_NONBLOCK instead of deprecated URL_FLAG_NONBLOCKAnton Khirnov2011-11-10
| |
| * http: use different classes for http and https.Anton Khirnov2011-11-10
| |
| * http: Change an error log message to a warningMartin Storsjö2011-11-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * http: Remove the now unused ff_http_set_headers custom functionMartin Storsjö2011-11-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * mms: Set http custom headers via the AVOptionMartin Storsjö2011-11-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: Set http custom headers via the AVOptionMartin Storsjö2011-11-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * http: Make custom headers settable via an AVOptionMartin Storsjö2011-11-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * crypto: Don't manually free memory allocated via AVOptionsMartin Storsjö2011-11-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * avio: Free URLContext private data allocated via AVOptionsMartin Storsjö2011-11-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * avc: fix memory errors when encoding invalid h264 codecdataJohn Brooks2011-11-09
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avcodec: add support for planar signed 8-bit PCM. ra144enc: add sample_fmts list to ff_ra_144_encoder smackaud: use uint8_t* for 8-bit output buffer type smackaud: clip output samples smackaud: use sign_extend() for difference value instead of casting sipr: use a function pointer to select the decode_frame function sipr: set mode based on block_align instead of bit_rate sipr: do not needlessly set *data_size to 0 when returning an error ra288: fix formatting of LOCAL_ALIGNED_16 udp: Allow specifying the local IP address VC1: Add bottom field offset to block_index[] to avoid rewriting (+10L) vc1dec: move an if() block. vc1dec: use correct hybrid prediction threshold. vc1dec: Partial rewrite of vc1_pred_mv() vc1dec: take ME precision into account while scaling MV predictors. lavf: don't leak corrupted packets Conflicts: libavcodec/8svx.c libavcodec/ra288.c libavcodec/version.h libavformat/iff.c libavformat/udp.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: add support for planar signed 8-bit PCM.Justin Ruggles2011-11-09
| | | | | | | | | | | | It is found in some 8svx files (e.g. ones created by SoX). Currently the decoder reuses the 8svx functions because we already have handling of a single large planar packet for the compressed 8svx codecs.
| * udp: Allow specifying the local IP addressMartin Storsjö2011-11-09
| | | | | | | | | | | | | | This is useful if sending multicast data on a host with multiple interfaces. Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavf: don't leak corrupted packetsAndrey Utkin2011-11-09
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | pthreads: drop has_b_frames mangling, its buggy in many many ways,Michael Niedermayer2011-11-09
| | | | | | | | | | | | | | | | not to mention race conditions and that its used for stream copy, used to determine IPB type by applications and other things. Fixes various frame drop/timestamp issues with frame multithreading. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | udp: simplify 7a032cb97f743a651138d2da6214c79e0ce089ddMichael Niedermayer2011-11-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix segfault on UDP readingAndrey Utkin2011-11-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: tls: Use ERR_get_error() in do_tls_poll indeo3: Fix a fencepost error. mxfdec: Fix comparison of unsigned expression < 0. mpegts: set stream id on just created stream, not an unrelated variable ra288: return error if input buffer is too small ra288: utilize DSPContext.vector_fmul() ra288: use memcpy() to copy decoded samples to output mace: only calculate output buffer size once Remove redundant filename self-references inside files. indeo3data: add missing config.h #include for HAVE_BIGENDIAN x86: drop pointless ARCH_X86 #ifdef from files in x86 subdirectory avplay: reset rdft when closing stream. doc/git-howto: expand format-patch and send-email notes. lavf: expand doxy for some AVFormatContext fields. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tls: Use ERR_get_error() in do_tls_pollMartin Storsjö2011-11-08
| | | | | | | | | | | | | | | | | | | | The return value ret isn't an error code that can be passed to ERR_error_string(). This makes the error messages printed actually contain useful information. Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-26 15:10:05 +0000