aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* lavf: deprecate get_strz() in favor of avio_get_strAnton Khirnov2011-03-055-15/+14
| | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit e16ead0716c2f988d1e26369a4c67b354ff86134)
* avio: add avio_get_str()Reimar Döffinger2011-03-052-0/+31
| | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 41d8555f72e3bc60cf93af2a1a4786b452fd2736)
* avio: fix fourcc if any character is >=0x80.Ronald S. Bultje2011-03-051-1/+4
| | | | | Fixes issue 2638. (cherry picked from commit fd085bc08203979c6d0e8a6ab031c7e19b57f7a1)
* In retry_transfer_wrapper, do not check url_interrupt_cb,Baptiste Coudurier2011-03-031-2/+0
| | | | causes problems when writing and pressing q during encoding.
* libavformat: Add av_pkt_dump{, _log}2, taking an AVStream parameterMartin Storsjö2011-03-032-11/+31
| | | | | | | | This removes a fixme issue, by allowing the av_pkt_dump functions to use the correct time base. Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 863c471638fa667e6e5c5df059b67af263e1cd40)
* aviobuf: Write new data at s->buf_end in fill_bufferMartin Storsjö2011-03-031-1/+1
| | | | | | | | | | | | | | | | In most cases, s->buf_ptr will be equal to s->buf_end when fill_buffer is called, but this may not always be the case, if we're seeking forward by reading (permitted by the short seek threshold). If fill_buffer is writing to s->buf_ptr instead of s->buf_end (when they aren't equal and s->buf_ptr is ahead of s->buffer), the data between s->buf_ptr and s->buf_end is overwritten, leading to inconsistent buffer content. This could return incorrect data if later seeking back into the area before the current s->buf_ptr. Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit e360ada2d13af36ab7afd9ebcd2bd236d23d9b96)
* movenc: use correct tag for dvcpro hdBaptiste Coudurier2011-03-031-6/+17
| | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 06ed4873e6e6aed8ec7cc24285d610ef4060880e)
* movenc: fix tkhd height for imxBaptiste Coudurier2011-03-031-1/+1
| | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit fffdee89cc0712ed3324bae1f86e271a36c02822)
* avio: deprecate url_fskipAnton Khirnov2011-03-032-7/+3
| | | | | | | avio_seek should be used instead Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 0300db8ad778a194b4a8ec98f6da3de5b41c46ee)
* lavf: replace all uses of url_fskip with avio_seekAnton Khirnov2011-03-0362-299/+299
| | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit e356fc57a2e9887370caec58d8aafeafd1f336dc)
* avio: avio_ prefix for url_fseekAnton Khirnov2011-03-0390-347/+352
| | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 6b4aa5dac8f41aa452d0ce9a1bede9e59a303060)
* In mov muxer, fix adpcm mono muxing, patch by Alex ConverseBaptiste Coudurier2011-02-271-0/+1
|
* In mpegts demuxer, do not output known sized packet if an unbounded packetBaptiste Coudurier2011-02-271-1/+1
| | | | is already queued. Fix issue #2624.
* movenc: remove uses of deprecated API.Ronald S. Bultje2011-02-261-4/+4
| | | | | Replace put_tag() with ffio_wfourcc() and ByteIOContext with AVIOContext. (cherry picked from commit 13ff92d19706d17f876ff676591dace0b3e34794)
* store pasp atom for all types of quicktime movieMaksym Veremeyenko2011-02-261-2/+1
| | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit d184c86cd309bbd61c5d1a1dfcf60d133da4c1e3)
* reindent after tapt patchMaksym Veremeyenko2011-02-261-5/+5
| | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 77d207cbe64710b7b34865f347e608b9c0e15968)
* use tapt atom for sample aspect ratioMaksym Veremeyenko2011-02-261-0/+35
| | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit ea1afa124cb58c7eebd4fd3706434fafb58b00c0)
* bink: decode audio track identifiers into AVStream.idPeter Ross2011-02-261-1/+2
| | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 588a3ffd9687cbef60cc26d5b3a247b8ecdbf75b)
* bink: set audio stream codec_tag such that binkaudio decoder can identify ↵Peter Ross2011-02-261-1/+1
| | | | | | | bitstream version Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit f0ca29eb5f476a281c8066214e3745244656d417)
* avio: deprecate put_tagAnton Khirnov2011-02-262-1/+3
| | | | | | | it's not used internally anymore and shouldn't be public. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 61840b43607679e8c4a1a63f005770f69dda12fa)
* lavf: replace remaining uses of put_tag with avio_writeAnton Khirnov2011-02-268-17/+20
| | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit bbc413f943b53d96aa85fe272ec413c85794019f)
* avienc: replace &tag[0] with tag.Anton Khirnov2011-02-261-7/+7
| | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 99f42c27abfe916fa19ac0c18489c8bbf8525406)
* lavf: use a new ffio_wfourcc macro instead of put_tag() where possibleAnton Khirnov2011-02-2612-152/+166
| | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 0abdb2931719d96dee725e555e9b46b2b2f8a6be)
* lavf: update documentation of AVOutputFormat.flagsAnssi Hannula2011-02-241-1/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf: postpone removal of deprecated avio functionsAnton Khirnov2011-02-231-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf: postpone removal of public metadata conversion APIAnton Khirnov2011-02-234-3/+8
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avienc: fix AVI stream index for files with >10 streamslongstone2011-02-232-2/+9
| | | | | | | Fixes issue 2563. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 4acc94e97a9551d11ead29735e23283d71f1d4c2)
* avio: rename url_fopen/fclose -> avio_open/close.Anton Khirnov2011-02-2312-30/+51
| | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 22a3212e32b696028e21f00871f3cb48c044029d)
* libavformat: Remove FF_NETERRNO()Martin Storsjö2011-02-237-24/+35
| | | | | | | | | | | | | | | Map EAGAIN and EINTR from ff_neterrno to the normal AVERROR() error codes. Provide fallback definitions of other errno.h network errors, mapping them to the corresponding winsock errors. This eases catching these error codes in common code, without having to distinguish between FF_NETERRNO(EAGAIN) and AVERROR(EAGAIN). This fixes roundup issue 2614, unbreaking blocking network IO on windows. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 28c4741a6617a4c1d2490cb13fc70ae4c9c472da)
* Add more AVC Intra FOURCCsBenjamin Larsson2011-02-231-2/+4
| | | | | | | | Also change the comments a bit since the FOURCCs aren't specific to Flip4Mac and different ones are used for 720 versus 1080 lines. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 8f935b9271052be8f97d655081b94b68b6c23bfb)
* mpegtsenc: use correct PES stream_id for AACTony Strauss2011-02-221-1/+2
| | | | | | | | This adds the AAC codec to the list of audio codecs that results in a PES stream_id of 0xc0 (audio stream). Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 6c065f0acd5b50a9037b561c6fc370b316832543)
* spdifenc.c: fix compile because of missing include avio_internal.h.Ronald S. Bultje2011-02-221-0/+1
| | | | (cherry picked from commit 0f86fcabdf74f658323140111dfd4de83f7f2eee)
* avio: make put_nbyte internal.Anton Khirnov2011-02-224-3/+9
| | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 0ac8e2bf2bf3d636241bf2811018d9974687a63c)
* avio: avio: avio_ prefixes for put_* functionsAnton Khirnov2011-02-2258-1749/+1784
| | | | | | | | | | | | | 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> (cherry picked from commit 77eb5504d3b3e1047900382350e0bc5e0bfb16b5)
* avio: make get_partial_buffer internal.Anton Khirnov2011-02-224-10/+16
| | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit b3db9ceef13037f2b6963a84b7abf8871a1e0f8a)
* avio: avio_ prefixes for get_* functionsAnton Khirnov2011-02-22107-1778/+1823
| | | | | | | | | | | | | | | 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> (cherry picked from commit b7effd4e8338f6ed5bda630ad7ed0809bf458648)
* avio: rename av_alloc_put_byte -> avio_alloc_context for consistencyAnton Khirnov2011-02-225-5/+26
| | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 8d9ac969cb4ac3e3e18f6425703af4d7aec6c513)
* Update version and APIchanges.Ronald S. Bultje2011-02-201-1/+1
| | | | | | | Update libavformat/version.h and doc/APIChanges after renaming init_put_byte() and ByteIOContext to ffio_init_context() (private) and AVIOContext, (public), and deprecating the originals. (cherry picked from commit d2bbf82e65e4a128ab1f0bf48df5d1e43c43c698)
* avio: move init_put_byte() to a new private header and rename itAnton Khirnov2011-02-2014-25/+87
| | | | | | | | 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> (cherry picked from commit e731b8d8729e75bfb69f5540e6446d6118dac549)
* avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-20139-829/+833
| | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128)
* MMS: also discover streams in extended stream properties objectMarton Balint2011-02-201-0/+28
| | | | | | | | Allows playback of nonprimary audio streams in multiple bitrate sources, such as mmsh://wmscr1.dr.dk/e02ch03m Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 74d6871d6244865b5863a01c3dab16a2f06a1706)
* lavf, lavu: bump minor versions and add an APIChanges entry for av_ prefixesAnton Khirnov2011-02-181-2/+2
| | | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit 09d171b98879f58be1a766d5f277e131b18e98a1)
* Move find_info_tag to lavu and add av_ prefix to itAnton Khirnov2011-02-187-59/+35
| | | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit ab0287fcbdebc8ff416214535d7ee8424406990e)
* Replace remaining uses of parse_date with av_parse_time.Anton Khirnov2011-02-181-2/+3
| | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 9fcae9735e3b97366dcee9ca3c2f6cf4faf6756f)
* Deprecate parse_date() in favor of av_parse_time().Stefano Sabatini2011-02-185-252/+17
| | | | | | | | | The new av_parse_time() is created in libavutil/parseutils.h, all the internal functions used by parse_date are moved to libavutil/parseutils.c and made static. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit f6c7375a175ac649558aefab14f3895b2cb469aa)
* lavf: add av_ prefix to dump_format()Anton Khirnov2011-02-185-6/+26
| | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 610219a598095f938705f200dfe3946455ef871a)
* rtsp: udp_read_packet returning 0 doesn't mean successMartin Storsjö2011-02-181-1/+1
| | | | | | | | | If udp_read_packet returns 0, rtsp_st isn't set and we shouldn't treat it as a successfully received packet (which is counted and possibly triggers a RTCP receiver report). This fixes issue 2612. (cherry picked from commit 2c35a6bde95a382e2d48570255deb67a7633fa46)
* spdifenc: set flag AVFMT_NOTIMESTAMPSAnssi Hannula2011-02-181-0/+1
| | | | | | | There are no timestamps in IEC 61937. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit 6c60fcf89afc84c9dc863669d78e611d7c72fe41)
* fix nsvdec.c compilation if DEBUG macro definedMaksym Veremeyenko2011-02-161-1/+1
| | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 41cdc1ff1e86f1bfb935e1bde53ccc9c645ff71e)
* Fix av_find_best_stream when using a programBalint Marton2011-02-161-1/+1
| | | | | | | | | The current implementation has a bug, it is returning the stream index in the found program, and not the stream index in the list of all streams. The attached patch fixes this issue. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 22ec6b738f1608e4b959fb655cf37c3343ec7e9f)