summaryrefslogtreecommitdiff
path: root/libavformat/aviobuf.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-221-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ffmpeg: get rid of the -vglobal option. dct32: Add AVX implementation of 32-point DCT dct32: Change pass 6 permutation to allow for AVX implementation dct32: port SSE 32-point DCT to YASM multiple inclusion guard cleanup avio: document buffer must created with av_malloc() and friends avio: check AVIOContext malloc failure swscale: point out an alternative to sws_getContext svq3: Do initialization after parsing the extradata add changelog entries for 0.7_beta2 mp3lame: add #include required for AV_RB32 macro. Conflicts: Changelog libavcodec/svq3.c libavcodec/x86/dct32_sse.c libavfilter/vsrc_buffer.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: check AVIOContext malloc failureCan Wu2011-05-211-0/+2
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Revert "Fix url_fopen() flag values."Michael Niedermayer2011-04-291-1/+1
| | | | | | | | | | | | | | No longer needed after martins change to the values. Though this would have been nicer ABI wise but iam too lazy to maintain this difference This reverts commit 183401b92419febf2c6aeaa2dfecdd16ad99bff8.
* | Fix url_fopen() flag values.Michael Niedermayer2011-04-281-1/+1
| | | | | | | | | | Reported by: Luca Abeni Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix some passing argument from incompatible pointer type warnings.Michael Niedermayer2011-04-241-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-201-17/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (37 commits) In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function. lavc: remove reference to opt.h from Makefile. prefer avio_check() over url_exist() avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols lavu: remove misc disabled cruft lavu: remove FF_API_OLD_IMAGE_NAMES cruft NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft lavc: remove misc disabled cruft. lavc: remove the FF_API_INOFFICIAL cruft. lavc: remove the FF_API_SET_STRING_OLD cruft. lavc: remove the FF_API_USE_LPC cruft. lavc: remove the FF_API_SUBTITLE_OLD cruft. lavc: remove the FF_API_VIDEO_OLD cruft. lavc: remove the FF_API_AUDIO_OLD cruft. lavc: remove the FF_API_OPT_SHOW cruft. lavc: remove the FF_API_MM_FLAGS cruft. lavf: remove misc disabled cruft. lavf: remove FF_API_INDEX_BUILT cruft lavf: remove FF_API_URL_CLASS cruft. lavf: remove FF_API_SYMVER cruft ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbolsStefano Sabatini2011-04-191-6/+6
| | | | | | | | | | | | | | | | Make AVIO_FLAG_ access constants work as flags, and in particular fix the behavior of functions (such as avio_check()) which expect them to be flags rather than modes. This breaks API.
| * lavf: remove FF_API_URL_RESETBUF cruftAnton Khirnov2011-04-191-11/+0
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-131-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Partially merged:flvdec: Allow parsing keyframes metadata without seeking in most cases Error out if vaapi is not found avio: undeprecate av_url_read_fseek/fpause under nicer names libvo-*: Don't use deprecated sample format names and enum names DUPLICATE flvdec: Fix support for flvtool2 "keyframes based" generated index DUPLICATE libavcodec: Use "const enum AVSampleFormat[]" in AVCodec initialization Fix the conversion of AV_SAMPLE_FMT_FLT and _DBL to AV_SAMPLE_FMT_S32. Convert some undefined 1<<31 shifts into 1U<<31. Conflicts: configure libavcodec/libvo-aacenc.c libavcodec/libvo-amrwbenc.c libavformat/flvdec.c Marged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: undeprecate av_url_read_fseek/fpause under nicer namesAnton Khirnov2011-04-121-4/+4
| | | | | | | | It seems their replacements won't be ready anytime soon.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-081-7/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: proto: include os_support.h in network.h matroskaenc: don't write an empty Cues element. lavc: add a FF_API_REQUEST_CHANNELS deprecation macro avio: move extern url_interrupt_cb declaration from avio.h to url.h avio: make av_register_protocol2 internal. avio: avio_ prefix for url_set_interrupt_cb. avio: AVIO_ prefixes for URL_ open flags. proto: introduce listen option in tcp doc: clarify configure features proto: factor ff_network_wait_fd and use it on udp Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: AVIO_ prefixes for URL_ open flags.Anton Khirnov2011-04-071-7/+7
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-061-4/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: psymodel: extend API to include PE and bit allocation. avio: always compile dyn_buf functions Remove unnecessary parameter from ff_thread_init() and fix behavior Revert "aac_latm_dec: use aac context and aac m4ac" configure: tell user if libva is enabled like the rest of external libs. Add silence support for AV_SAMPLE_FMT_U8. avio: make URL_PROTOCOL_FLAG_NESTED_SCHEME internal avio: deprecate av_url_read_seek avio: deprecate av_url_read_pause ac3enc: NEON optimised extract_exponents Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: always compile dyn_buf functionsAnton Khirnov2011-04-051-4/+0
| | | | | | | | | | | | Fixes build with --disable-muxers --disable-network. Thanks to Hendrik Leppkes for noticing.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-051-5/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) ac3enc: move extract_exponents inner loop to ac3dsp avio: deprecate url_get_filename(). avio: deprecate url_max_packet_size(). avio: make url_get_file_handle() internal. avio: make url_filesize() internal. avio: make url_close() internal. avio: make url_seek() internal. avio: cosmetics, move AVSEEK_SIZE/FORCE declarations together avio: make url_write() internal. avio: make url_read_complete() internal. avio: make url_read() internal. avio: make url_open() internal. avio: make url_connect internal. avio: make url_alloc internal. applehttp: Merge two for loops applehttp: Restructure the demuxer to use a custom AVIOContext applehttp: Move finished and target_duration to the variant struct aacenc: reduce the number of loop index variables avio: deprecate url_open_protocol avio: deprecate url_poll and URLPollEntry ... Conflicts: libavformat/applehttp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: deprecate url_max_packet_size().Anton Khirnov2011-04-041-1/+1
| | | | | | | | URLContext.max_packet_size should be used directly.
| * avio: make url_close() internal.Anton Khirnov2011-04-041-2/+2
| |
| * avio: make url_seek() internal.Anton Khirnov2011-04-041-1/+1
| |
| * avio: make url_write() internal.Anton Khirnov2011-04-041-1/+1
| |
| * avio: make url_read() internal.Anton Khirnov2011-04-041-1/+1
| |
| * avio: make url_open() internal.Anton Khirnov2011-04-041-1/+2
| |
* | Only make buffer smaller in fill_buffer() if read_packet() is set.Carl Eugen Hoyos2011-04-041-1/+1
| | | | | | | | Fixes a possible invalid free().
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-041-21/+35
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: fix partial run when no samples path is specified ARM: NEON fixed-point forward MDCT ARM: NEON fixed-point FFT lavf: bump minor version and add an APIChanges entry for avio changes avio: simplify url_open_dyn_buf_internal by using avio_alloc_context() avio: make url_fdopen internal. avio: make url_open_dyn_packet_buf internal. avio: avio_ prefix for url_close_dyn_buf avio: avio_ prefix for url_open_dyn_buf avio: introduce an AVIOContext.seekable field ac3enc: use generic fixed-point mdct lavfi: add fade filter Change yadif to not use out of picture lines. lavc: deprecate AVCodecContext.antialias_algo lavc: mark mb_qmin/mb_qmax for removal on next major bump. Conflicts: doc/filters.texi libavcodec/ac3enc_fixed.h libavcodec/ac3enc_float.h libavfilter/Makefile libavfilter/allfilters.c libavfilter/vf_fade.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: simplify url_open_dyn_buf_internal by using avio_alloc_context()Anton Khirnov2011-04-031-14/+6
| |
| * avio: make url_fdopen internal.Anton Khirnov2011-04-031-2/+6
| | | | | | | | | | The unbuffered URLContext API will be made private, so there's no point in this function being public.
| * avio: make url_open_dyn_packet_buf internal.Anton Khirnov2011-04-031-1/+5
| | | | | | | | | | | | | | It doesn't look fit to be a part of the public API. Adding a temporary hack to ffserver to be able to use it, should be cleaned up when somebody is up for it.
| * avio: avio_ prefix for url_close_dyn_bufAnton Khirnov2011-04-031-2/+6
| |
| * avio: avio_ prefix for url_open_dyn_bufAnton Khirnov2011-04-031-2/+6
| |
| * avio: introduce an AVIOContext.seekable fieldAnton Khirnov2011-04-031-1/+7
| | | | | | | | Use it instead of url_is_streamed and AVIOContext.is_streamed.
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-311-2/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: rtsp: Use GET_PARAMETER for keep-alive for generic RTSP servers mlp_parse.c: set AVCodecContext channel_layout APIChanges: mark the place where 0.6 was branched. avio: make get_checksum() internal. avio: move ff_crc04C11DB7_update() from avio.h -> avio_internal.h avio: make init_checksum() internal. NOT MERGED Add MxPEG decoder NOT MERGED Add support for picture_ptr field in MJpegDecodeContext NOT MERGED Move MJPEG's input buffer preprocessing in separate public function NOT MERGED Support reference picture defined by bitmask in MJPEG's SOS decoder sndio bug fix Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: make get_checksum() internal.Anton Khirnov2011-03-301-1/+5
| |
| * avio: make init_checksum() internal.Anton Khirnov2011-03-301-1/+7
| |
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-231-3/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: (33 commits) Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size. Add kbdwin.o to AC3 decoder Detect byte-swapped AC-3 and support decoding it directly. cosmetics: indentation Always copy input data for AC3 decoder. ac3enc: make sym_quant() branch-free cosmetics: indentation Add a CPU flag for the Atom processor. id3v2: skip broken tags with invalid size id3v2: don't explicitly skip padding Make sure kbhit() is in conio.h fate: update wmv8-drm reference vc1: make P-frame deblock filter bit-exact. configure: Add the -D parameter to the dlltool command amr: Set the AVFMT_GENERIC_INDEX flag amr: Set the pkt->pos field properly to the start of the packet amr: Set the codec->bit_rate field based on the last packet rtsp: Specify unicast for TCP interleaved streams, too Set the correct target for mingw64 dlltool applehttp: Change the variable for stream position in seconds into int64_t ... Conflicts: ffmpeg.c ffplay.c libavcodec/ac3dec.c libavformat/avio.h libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: make av_url_read_fseek/fpause internal.Anton Khirnov2011-03-211-3/+12
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: deprecate url_filenoAnton Khirnov2011-03-201-0/+2
| | | | | | | | | | | | | | | | It's an evil hack that assumes an AVIOContext is always based on top of an URLContext. It's also not used anywhere. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-171-9/+29
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: Changelog doc/APIchanges doc/optimization.txt libavformat/avio.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: rename put_flush_packet -> avio_flushAnton Khirnov2011-03-161-3/+7
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: deprecate url_close_bufAnton Khirnov2011-03-161-1/+1
| | | | | | | | | | | | It's not used anywhere and its return value looks broken. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: deprecate url_open_bufAnton Khirnov2011-03-161-0/+2
| | | | | | | | | | | | | | It's only used in one place and does the same thing as avio_alloc_context. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: always compile avio_printf, rather than on CONFIG_MUXERSAnton Khirnov2011-03-161-2/+0
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio_ prefix for url_fprintfAnton Khirnov2011-03-161-1/+13
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: make url_setbufsize internal.Anton Khirnov2011-03-161-2/+6
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * lavf: move ff_get_v from avio.h to avio_internal.hAnton Khirnov2011-03-161-1/+1
| | | | | | | | | | | | And rename it to ffio_read_varlen. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-151-2/+4
|\ \ | |/ | | | | Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: deprecate url_ferrorAnton Khirnov2011-03-151-3/+3
| | | | | | | | | | | | AVIOContext.error should be used directly instead. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: deprecate url_feofAnton Khirnov2011-03-071-4/+6
| | | | | | | | | | | | AVIOContext.eof_reached should be used directly instead. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: move ff_rewind_with_probe_data from avio.h to avio_internal.hAnton Khirnov2011-03-071-1/+1
| | | | | | | | | | | | also change its prefix to ffio Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: deprecate url_fget_max_packet_sizeAnton Khirnov2011-03-071-1/+1
| | | | | | | | | | | | AVIOContext.max_packet_size should be used directly instead. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio_ prefix for url_fsizeAnton Khirnov2011-03-071-1/+5
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>