summaryrefslogtreecommitdiff
path: root/libavformat/avio.h
Commit message (Collapse)AuthorAge
* Merge remote branch 'qatar/master'Michael Niedermayer2011-04-02
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ac3enc: ARM optimised ac3_compute_matissa_size ac3: armv6 optimised bit_alloc_calc_bap fate: simplify fft test rules avio: document avio_alloc_context. lavf: make compute_chapters_end less picky. sierravmd: fix Indeo3 videos FFT: simplify fft8() fate: add fixed-point fft/mdct tests Fixed-point support in fft-test ape: check that number of seektable entries is equal to number of frames Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: document avio_alloc_context.Anton Khirnov2011-04-01
| |
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-30
| |
| * avio: move ff_crc04C11DB7_update() from avio.h -> avio_internal.hAnton Khirnov2011-03-30
| |
| * avio: make init_checksum() internal.Anton Khirnov2011-03-30
| |
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: avio: make udp_set_remote_url/get_local_port internal. asfdec: also subtract preroll when reading simple index object matroskaenc: remove a variable that's unused after bc17bd9. avio: cosmetics - nicer vertical alignment. Remove unnecessary icc version checks Disable 'attribute "foo" ignored' warnings from icc rtsp: Don't use a locale dependent format string Add xd55 codec tag for XDCAM HD422 720p25 CBR files. configure: get libavcodec version from new version.h header lavc: move the version macros to a new installed header. matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config Do not use format string "%0.3f" for RTSP Range field. Add apply_window_int16() to DSPContext with x86-optimized versions and use it in the ac3_fixed encoder. Document usage of import libraries created by dlltool configure: Set the correct lib target for arm/wince dlltool fate: simplify regression-funcs.sh fate: add support for multithread testing Conflicts: libavformat/rtspdec.c libavutil/attributes.h libavutil/internal.h libavutil/mem.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: make udp_set_remote_url/get_local_port internal.Anton Khirnov2011-03-23
| |
| * avio: cosmetics - nicer vertical alignment.Anton Khirnov2011-03-23
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-21
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: deprecate url_filenoAnton Khirnov2011-03-20
| | | | | | | | | | | | | | | | 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-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-17
|\| | | | | | | | | | | | | | | | | | | 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-16
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: deprecate url_close_bufAnton Khirnov2011-03-16
| | | | | | | | | | | | 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-16
| | | | | | | | | | | | | | 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: avio_ prefix for url_fprintfAnton Khirnov2011-03-16
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: change avio_tell/skip from macros to inline functionsAnton Khirnov2011-03-16
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: make url_setbufsize internal.Anton Khirnov2011-03-16
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * lavf: move ff_get_v from avio.h to avio_internal.hAnton Khirnov2011-03-16
| | | | | | | | | | | | 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-15
|\| | | | | | | Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Use AVERROR_EXIT with url_interrupt_cb.Nicolas George2011-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | Functions interrupted by url_interrupt_cb should not be restarted. Therefore using AVERROR(EINTR) was wrong, as it did not allow to distinguish when the underlying system call was interrupted and actually needed to be restarted. This fixes roundup issues 2657 and 2659 (ffplay not exiting for streamed content). Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: deprecate url_ferrorAnton Khirnov2011-03-15
| | | | | | | | | | | | AVIOContext.error should be used directly instead. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: deprecate url_feofAnton Khirnov2011-03-07
| | | | | | | | | | | | 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-07
| | | | | | | | | | | | also change its prefix to ffio Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: deprecate url_fget_max_packet_sizeAnton Khirnov2011-03-07
| | | | | | | | | | | | 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-07
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: deprecate url_fgetc and remove all it usesAnton Khirnov2011-03-07
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: deprecate url_fgetsAnton Khirnov2011-03-07
| | | | | | | | | | | | It's not used anywhere and doesn't look ver useful to be public. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: add avio_skip macroPeter Ross2011-03-07
| | | | | | | | | | | | | | | | | | This is a substitute for the url_fskip function that was deprecated by commit 0300db8ad778a194b4a8ec98f6da3de5b41c46ee. avio_fskip is provided to improve demuxer code readability. It distinguishes the act of skipping over unknown or irrelevant bytes from the standard avio_seek operation. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * URLProtocol: Add URL_PROTOCOL_FLAG_NESTED_SCHEMEMartin Storsjö2011-03-06
| | | | | | | | | | | | | | | | | | If this flag is set, the protocol can handle URLs where the scheme is a nested scheme such as applehttp+file: - the protocol can handle any URL where the first segment of the nested scheme belongs to this protocol. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * URLProtocol: Add a flags fieldMartin Storsjö2011-03-06
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov2011-03-04
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * lavf: deprecate get_strz() in favor of avio_get_strAnton Khirnov2011-03-04
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: add avio_get_str()Reimar Döffinger2011-03-04
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: deprecate url_fskipAnton Khirnov2011-03-01
| | | | | | | | | | | | avio_seek should be used instead Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio_ prefix for url_fseekAnton Khirnov2011-03-01
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: deprecate put_tagAnton Khirnov2011-02-25
| | | | | | | | | | | | it's not used internally anymore and shouldn't be public. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: rename url_fopen/fclose -> avio_open/close.Anton Khirnov2011-02-23
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: make put_nbyte internal.Anton Khirnov2011-02-21
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio: avio_ prefixes for put_* functionsAnton Khirnov2011-02-21
| | | | | | | | | | | | | | | | | | | | | | | | In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: make get_partial_buffer internal.Anton Khirnov2011-02-21
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio_ prefixes for get_* functionsAnton Khirnov2011-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In the name of consistency: get_byte -> avio_r8 get_<type> -> avio_r<type> get_buffer -> avio_read get_partial_buffer will be made private later get_strz is left out becase I want to change it later to return something useful. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: rename av_alloc_put_byte -> avio_alloc_context for consistencyAnton Khirnov2011-02-21
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: move init_put_byte() to a new private header and rename itAnton Khirnov2011-02-20
| | | | | | | | | | | | | | init_put_byte should never be used outside of lavf, since sizeof(AVIOContext) isn't part of public ABI. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-20
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Non-blocking protocol: core wrapper functionsNicolas George2011-02-05
| | | | | | | | | | Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Non-blocking protocols: flag and documentationNicolas George2011-02-05
| | | | | | | | | | Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * lavf: make a variant of ff_get_str16_nolen publicAnton Khirnov2011-01-25
| | | | | | | | | | | | It will be useful in mp3 demuxer and hopeful some other places. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>