generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
64,787 Commits 24 Branches 241 Tags 173 MiB
0e70266bbf
Commit Graph

267 Commits

Author SHA1 Message Date
Michael Niedermayer
1caa4123bd Merge remote-tracking branch 'newdev/master' 
* 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>
 2011-03-31 12:48:41 +02:00
Anton Khirnov
b64030f26d avio: make get_checksum() internal. 2011-03-30 07:48:55 +02:00
Anton Khirnov
4c4427a75d avio: make init_checksum() internal. 2011-03-30 07:47:08 +02:00
Michael Niedermayer
4fa0e24736 Merge remote-tracking branch 'newdev/master' 
* 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>
 2011-03-23 02:42:56 +01:00
Anton Khirnov
933e90a69a avio: make av_url_read_fseek/fpause internal. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-21 14:54:52 -04:00
Anton Khirnov
8d9769a77b avio: deprecate url_fileno 
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>
 2011-03-20 20:33:05 -04:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Michael Niedermayer
0fecf2642b Merge remote-tracking branch 'newdev/master' 
Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 17:22:52 +01:00
Anton Khirnov
b7f2fdde74 avio: rename put_flush_packet -> avio_flush 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04:00
Anton Khirnov
35f1023592 avio: deprecate url_close_buf 
It's not used anywhere and its return value looks broken.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04:00
Anton Khirnov
83fddaeb81 avio: deprecate url_open_buf 
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>
 2011-03-16 22:59:39 -04:00
Anton Khirnov
eda4cf92d7 avio: always compile avio_printf, rather than on CONFIG_MUXERS 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04:00
Anton Khirnov
d9d86e00b2 avio: avio_ prefix for url_fprintf 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04:00
Anton Khirnov
59f65d9579 avio: make url_setbufsize internal. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:38 -04:00
Anton Khirnov
4839c192de lavf: move ff_get_v from avio.h to avio_internal.h 
And rename it to ffio_read_varlen.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:38 -04:00
Michael Niedermayer
6947b0c42e Merge remote-tracking branch 'newdev/master' 
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-15 16:48:42 +01:00
Anton Khirnov
3e68b3ba7b avio: deprecate url_ferror 
AVIOContext.error should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-15 08:04:28 -04:00
Michael Niedermayer
75a8e0f0ab Add avio_skip() 2011-03-11 12:25:44 +01:00
Michael Niedermayer
3bd624b4ee Fix url_feof() for file appendings. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-10 16:26:48 +01:00
Anton Khirnov
f8bc86d47e avio: move ff_rewind_with_probe_data from avio.h to avio_internal.h 
also change its prefix to ffio

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit f1ef2cd9ed)
 2011-03-08 02:09:34 +01:00
Anton Khirnov
718975aa11 avio: deprecate url_fget_max_packet_size 
AVIOContext.max_packet_size should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e8bb2e2439)
 2011-03-08 02:09:33 +01:00
Anton Khirnov
db44ea960d avio: avio_ prefix for url_fsize 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 76aa876e69)
 2011-03-08 02:09:21 +01:00
Anton Khirnov
1447dc59de avio: deprecate url_fgetc and remove all it uses 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e51975392d)
 2011-03-08 02:09:17 +01:00
Anton Khirnov
de3ef79250 avio: deprecate url_fgets 
It's not used anywhere and doesn't look ver useful to be public.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 655e45e7df)
 2011-03-08 02:09:16 +01:00
Anton Khirnov
66e5b1df36 avio: deprecate url_feof 
AVIOContext.eof_reached should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 17:20:31 -05:00
Anton Khirnov
f1ef2cd9ed avio: move ff_rewind_with_probe_data from avio.h to avio_internal.h 
also change its prefix to ffio

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 12:25:36 -05:00
Anton Khirnov
e8bb2e2439 avio: deprecate url_fget_max_packet_size 
AVIOContext.max_packet_size should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 12:25:36 -05:00
Anton Khirnov
76aa876e69 avio: avio_ prefix for url_fsize 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 11:03:39 -05:00
Anton Khirnov
e51975392d avio: deprecate url_fgetc and remove all it uses 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 10:51:21 -05:00
Anton Khirnov
655e45e7df avio: deprecate url_fgets 
It's not used anywhere and doesn't look ver useful to be public.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 10:19:46 -05:00
Anton Khirnov
384c9c2fa7 avio: add avio_tell macro as a replacement for url_ftell 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a2704c9712)
 2011-03-05 02:29:31 +01:00
Anton Khirnov
773947ba76 lavf: deprecate get_strz() in favor of avio_get_str 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e16ead0716)
 2011-03-05 02:29:28 +01:00
Reimar Döffinger
3e1a8e1ec1 avio: add avio_get_str() 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 41d8555f72)
 2011-03-05 02:29:28 +01:00
Anton Khirnov
a2704c9712 avio: add avio_tell macro as a replacement for url_ftell 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-04 11:26:57 -05:00
Anton Khirnov
e16ead0716 lavf: deprecate get_strz() in favor of avio_get_str 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-04 11:26:02 -05:00
Reimar Döffinger
41d8555f72 avio: add avio_get_str() 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-04 11:24:58 -05:00
Martin Storsjö
62d0a7453a aviobuf: Write new data at s->buf_end in fill_buffer 
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 e360ada2d1)
 2011-03-03 14:15:09 +01:00
Anton Khirnov
813cc7abaf avio: deprecate url_fskip 
avio_seek should be used instead

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 0300db8ad7)
 2011-03-03 14:15:09 +01:00
Anton Khirnov
f59d8ff8cd avio: avio_ prefix for url_fseek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6b4aa5dac8)
 2011-03-03 14:15:03 +01:00
Martin Storsjö
e360ada2d1 aviobuf: Write new data at s->buf_end in fill_buffer 
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>
 2011-03-02 11:16:17 +01:00
Anton Khirnov
0300db8ad7 avio: deprecate url_fskip 
avio_seek should be used instead

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-01 12:27:08 -05:00
Anton Khirnov
6b4aa5dac8 avio: avio_ prefix for url_fseek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-01 12:12:33 -05:00
Anton Khirnov
3308ddfb36 avio: deprecate put_tag 
it's not used internally anymore and shouldn't be public.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 61840b4360)
 2011-02-26 03:16:05 +01:00
Anton Khirnov
61840b4360 avio: deprecate put_tag 
it's not used internally anymore and shouldn't be public.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-25 14:38:57 -05:00
Anton Khirnov
ebb92e0768 avio: rename url_fopen/fclose -> avio_open/close. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 22a3212e32)
 2011-02-23 18:22:03 +01:00
Anton Khirnov
22a3212e32 avio: rename url_fopen/fclose -> avio_open/close. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 10:18:55 -05:00
Anton Khirnov
2df9d0008e avio: make put_nbyte internal. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 0ac8e2bf2b)
 2011-02-22 02:44:38 +01:00
Anton Khirnov
e9eb8d0bce avio: avio: avio_ prefixes for put_* functions 
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 77eb5504d3)
 2011-02-22 02:44:38 +01:00
Anton Khirnov
d4e321d9c2 avio: make get_partial_buffer internal. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b3db9ceef1)
 2011-02-22 02:44:37 +01:00
Anton Khirnov
e63a362857 avio: avio_ prefixes for get_* functions 
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 b7effd4e83)
 2011-02-22 02:44:37 +01:00
Anton Khirnov
90ed2776ea avio: rename av_alloc_put_byte -> avio_alloc_context for consistency 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 8d9ac969cb)
 2011-02-22 02:44:36 +01:00
Anton Khirnov
0ac8e2bf2b avio: make put_nbyte internal. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-21 14:25:17 -05:00
Anton Khirnov
77eb5504d3 avio: avio: avio_ prefixes for put_* functions 
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>
 2011-02-21 14:25:15 -05:00
Anton Khirnov
b3db9ceef1 avio: make get_partial_buffer internal. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-21 13:40:28 -05:00
Anton Khirnov
b7effd4e83 avio: avio_ prefixes for get_* functions 
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>
 2011-02-21 11:23:22 -05:00
Anton Khirnov
8d9ac969cb avio: rename av_alloc_put_byte -> avio_alloc_context for consistency 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-21 10:23:44 -05:00
Anton Khirnov
ae99313aa5 avio: move init_put_byte() to a new private header and rename it 
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 e731b8d872)
 2011-02-20 19:05:47 +01:00
Anton Khirnov
471fe57e1a avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd)
 2011-02-20 19:05:47 +01:00
Anton Khirnov
e731b8d872 avio: move init_put_byte() to a new private header and rename it 
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>
 2011-02-20 08:37:31 -05:00
Anton Khirnov
ae628ec1fd avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-20 08:37:15 -05:00
Anton Khirnov
f9d6b13a23 lavf: make a variant of ff_get_str16_nolen public 
It will be useful in mp3 demuxer and hopeful some other places.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 93b78d1210)
 2011-01-26 03:43:31 +01:00
Anton Khirnov
93b78d1210 lavf: make a variant of ff_get_str16_nolen public 
It will be useful in mp3 demuxer and hopeful some other places.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-25 21:48:03 +01:00
Anton Khirnov
6e89b61293 lavf: move ff_put_str16_nolen from asf to avio and rename it 
It will be useful in the mp3 muxer.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit dccbd97d72)
 2011-01-23 19:32:06 +01:00
Anton Khirnov
e910a77b0d avio: add av_put_str and deprecate put_strz in favor of it 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4efd5cf34b)
 2011-01-23 19:32:06 +01:00
Anton Khirnov
dccbd97d72 lavf: move ff_put_str16_nolen from asf to avio and rename it 
It will be useful in the mp3 muxer.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-21 20:21:51 +00:00
Anton Khirnov
4efd5cf34b avio: add av_put_str and deprecate put_strz in favor of it 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-21 20:21:03 +00:00
Martin Storsjö
c66f53cf8b Revert aviobuf: Retry if the read/write function returns AVERROR(EAGAIN) 
This reverts SVN commit 26318, which broke MS-RTSP playback.

Originally committed as revision 26326 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-13 06:22:43 +00:00
Martin Storsjö
a6963f8304 aviobuf: Retry if the read/write function returns AVERROR(EAGAIN) 
Originally committed as revision 26318 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-12 07:06:27 +00:00
Anssi Hannula
17ee8f669f Add function put_nbyte() to speed up padding in SPDIF muxer. 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26193 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 10:45:07 +00:00
Aurelien Jacobs
364cacc7c7 add FF_API_URL_RESETBUF define to disable the deprecated url_resetbuf() 
public function

Originally committed as revision 24841 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-19 21:28:43 +00:00
Reimar Döffinger
853a0fccce Cosmetics: fix indentation and remove a useless else. 
Originally committed as revision 24495 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-25 14:35:12 +00:00
Reimar Döffinger
3aa13da970 Simplify get_byte and url_fgetc. 
Originally committed as revision 24494 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-25 14:33:40 +00:00
Martin Storsjö
496c645d3b Never shrink the ByteIOContext buffer in ff_rewind_with_probe_data 
If there is little unread data in the ByteIOContext buffer, this may lead
to reducing the size of the ByteIOContext buffer to little more the probe
data size. This can lead to suboptimal aviobuf behaviour, e.g. making some
demuxers fail to do short seeks backwards (if the input isn't seekable).

Originally committed as revision 24478 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-24 09:04:44 +00:00
Aurelien Jacobs
a43416a540 improve ff_get_line to return line length 
Originally committed as revision 24400 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-21 21:40:10 +00:00
Aurelien Jacobs
7c89295145 move ff_get_line to aviobuf.c 
Originally committed as revision 24399 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-21 21:39:01 +00:00
Martin Storsjö
aff4137d5f Remove an assert that was no longer correct nor relevant 
Originally committed as revision 24344 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-20 09:58:30 +00:00
Martin Storsjö
7939d0edce aviobuf: Do short seeks forward by reading and skipping data instead of a proper seek 
This improves performance on e.g. seekable http.

Originally committed as revision 24280 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-17 05:26:30 +00:00
Martin Storsjö
d5e9ddeb73 url_fskip: Return an error code if the url_fseek failed 
Originally committed as revision 24277 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-16 23:20:03 +00:00
Michael Chinen
603e5c0b71 move ff_get_v_length and ff_put_v from nutenc.c to internal.h/aviobuf.c 
patch by Micheal Chinen < mchinen gmail >

Originally committed as revision 24140 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-09 12:14:33 +00:00
Eli Friedman
6fa197e277 Silence a warning when compiling aviobuf.c 
Patch by Eli Friedman, eli d friedman a gmail

Originally committed as revision 24055 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-05 09:11:45 +00:00
Josh Allmann
de1807bbc4 Pad the buffer in url_close_dyn_buf, for buffers opened with url_open_dyn_buf 
Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23942 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-01 20:15:49 +00:00
Stefano Sabatini
9d30e0682a Do not initialize res in url_fseek(), in the case !s->seek directly 
return AVERROR(EPIPE) rather than the pre-defined value of res.

Slightly improve readability.

Originally committed as revision 22939 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-21 21:19:25 +00:00
Stefano Sabatini
4c4ef3db4b Make url_fsize() return AVERROR(ENOSYS) rather than AVERROR(EPIPE) if 
the seek operation is not defined in the ByteIOContext.

Originally committed as revision 22902 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-18 17:37:21 +00:00
Howard Chu
c007c687c9 Do not set pos to an error value. 
Patch by Howard Chu, hyc highlandsun com

Originally committed as revision 22853 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-12 15:03:30 +00:00
Tomas Härdin
7a6fe01f99 Seeking forward in non-seekable media by discarding data, regardless of how far to seek. Won't SEEK_END unless forced though. 
Originally committed as revision 22822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-08 09:47:32 +00:00
Tomas Härdin
01d91b9be9 Reusing the probe buffer to rewind the ByteIOContext in ff_probe_input_buffer() instead of seeking back to the start of the file. Once exhausted, the size of the buffer is reduced. 
Originally committed as revision 22821 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-08 09:02:27 +00:00
Tomas Härdin
c6a5e087cf Mask away AVSEEK_FORCE properly in some checks in url_fseek() 
Patch by Tomas Härdin $(name).$(s/ä/a/ $(surname)) AT codemill DOT se

Originally committed as revision 22653 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-24 10:41:58 +00:00
Stefano Sabatini
8d5e638f04 Make url_fseek() return AVERROR_EOF rather than AVERROR(EPIPE) if end 
of file is reached.

Originally committed as revision 22590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-18 00:22:58 +00:00
Michael Niedermayer
493f54ada0 Add AVSEEK_FORCE flag to indicate that the code should attempt to seek 
by any means.

Originally committed as revision 22557 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 22:54:22 +00:00
Stefano Sabatini
8757dc5e40 Remove duplicated empty line. 
Originally committed as revision 21553 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-30 20:18:55 +00:00
Benoit Fouet
08580cb05a Make url_resetbuf() assert on wrong flags passed and make it static on next 
version bump.
See thread: [FFmpeg-devel] & vs. &&
Date: Mon, 12 Oct 2009 14:21:06 +0200

Originally committed as revision 20330 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-20 06:40:01 +00:00
Reimar Döffinger
90aa6ace63 Merge declaration and initialization 
Originally committed as revision 20214 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-12 16:38:08 +00:00
Reimar Döffinger
098d8e0950 Simplify: use FFMIN 
Originally committed as revision 20213 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-12 16:36:48 +00:00
Reimar Döffinger
7f7686dfb1 Make get_buffer and get_partial_buffer return url_ferror or AVERROR_EOF as 
appropriate if it couldn't read any data at all.
This should make handling of EOF and error simpler or make it work right without
extra code in a few place (e.g. raw demuxer).

Originally committed as revision 20135 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-02 06:36:39 +00:00
Baptiste Coudurier
b3eab9fb64 seek inside buffer when offset is exactly at the end, fix seeking with memory ByteIOContext 
Originally committed as revision 18487 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-13 04:02:51 +00:00
Reimar Döffinger
0c5a43d648 Merge declaration and initialization of io_buffer_size 
Originally committed as revision 16639 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 16:39:17 +00:00
Reimar Döffinger
2bdaf78c52 Make io_buffer_size unsigned to avoid a warning about comparing 
signed and unsigned values.

Originally committed as revision 16638 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 16:37:54 +00:00
Reimar Döffinger
0e7ceb2442 Return AVERROR(ENOMEM) instead of -1 when malloc fails in url_open_dyn_buf_internal 
Originally committed as revision 16636 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 15:35:51 +00:00
Reimar Döffinger
aa805f94c5 Use AV_WB32 instead of reimplementing it. 
Originally committed as revision 16635 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 15:34:37 +00:00
Reimar Döffinger
dc2c2eea41 Use av_mallocz instead of explicitly zeroing in url_open_dyn_buf_internal. 
Originally committed as revision 16634 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 15:32:33 +00:00
Reimar Döffinger
7ce820efa0 Replace nonsense -1234 return value in dyn_buf_write by proper AVERROR(ENOMEM) 
Originally committed as revision 16633 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 15:30:52 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Aurelien Jacobs
9daa4ceaa3 Initialize s->opaque before calling url_resetbuf(). 
Fixes a regression test crash for icc 10.1 64 bit.

Patch by Aurelien.

Originally committed as revision 16271 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-22 11:23:00 +00:00
Diego Biurrun
7f37f5687d whitespace cosmetics 
Originally committed as revision 16100 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-13 13:39:13 +00:00
Jindřich Makovička
f5edd874fa always use the whole buffer for reading w/ packetized sources to avoid packet truncation 
Originally committed as revision 15799 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-10 21:41:35 +00:00
Michael Niedermayer
4589dc5c4d Append read data onto the buffer instead of overwriting, this ensures 
that the whole buffer is available for seeking back.
Fixes issue480

Originally committed as revision 15634 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-18 17:30:37 +00:00
Reimar Döffinger
6bc03a695b Make size variables in dyn_buf_write unsigned so gcc will not optimize the 
check away (due to assuming signed overflows do not happen).

Originally committed as revision 15555 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 21:11:58 +00:00
Diego Biurrun
bc5c918ea8 Remove offset_t typedef and use int64_t directly instead. 
The name offset_t is easily confused with the standard off_t type and
*_t is POSIX reserved namespace if any POSIX header is included.

Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-03 10:16:29 +00:00
Baptiste Coudurier
39a127bfbc Only reset buffer state if seeking is successful; update seek reg ref. 
Originally committed as revision 14491 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-31 19:40:06 +00:00
Diego Biurrun
245976da2a Use full path for #includes from another directory. 
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 11:56:36 +00:00
Aurelien Jacobs
3abe5fbdc4 improve CRC API 
- don't export any global var
 - provide either generated or hardcoded tables

Originally committed as revision 11409 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-04 23:09:58 +00:00
Reimar Döffinger
1e0f346896 Add a av_alloc_put_byte function. 
The name is in analogy to init_put_byte, but I would not mind it
being changed to something better.

Originally committed as revision 11305 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-22 16:18:07 +00:00
Michael Niedermayer
b075e52059 Make recently added and still unused read_seek functions return offset_t. 
Originally committed as revision 11274 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-19 21:11:08 +00:00
Michael Niedermayer
502bdf6893 Merge recently added and still unused play and pause functions. 
Originally committed as revision 11273 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-19 20:57:13 +00:00
Michael Niedermayer
004050eed7 Remove unneeded avio wrapper functions. 
Originally committed as revision 11264 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-19 02:33:47 +00:00
Baptiste Coudurier
5cb4b82a17 return error when url_fseek could not read until desired offset in streamed mode 
Originally committed as revision 11233 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-16 17:52:46 +00:00
Björn Axelsson
e7e4810aae Extend ByteIOContext and add the buffered IO functions: 
av_url_read_fplay(), av_url_read_fpause() and av_url_read_fseek().

patch by: Björn Axelsson, bjorn d axelsson a intinor d se

Originally committed as revision 11110 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-28 19:46:49 +00:00
Björn Axelsson
899681cd1d Use dynamically allocated ByteIOContext in AVFormatContext 
patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-21 07:41:00 +00:00
Kostya Shishkov
7798b42df1 Add ff_ prefix to get_v() 
Originally committed as revision 10912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-03 18:29:16 +00:00
Kostya Shishkov
897d3eef4c Make get_v() available to the other demuxers 
Originally committed as revision 10911 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-03 18:26:42 +00:00
Baptiste Coudurier
992e78f5f2 rename av_crc04C11DB7_update to ff_crc04C11DB7_update and move it to aviobuf.c so it can be reused by other (de)muxers 
Originally committed as revision 10873 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-30 00:01:25 +00:00
Björn Axelsson
770d9dafa1 Add functionality to set the direction of a ByteIOContext buffer. 
Patch by Björn Axelsson bjorn axelsson intinor se
Original thread: [FFmpeg-devel] [PATCH] MMS protocol support patch 1
Date: 09/19/2007 05:51 PM

Originally committed as revision 10709 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-11 14:57:47 +00:00
Benoit Fouet
2d89f334f4 Indentation 
Originally committed as revision 10589 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-26 11:33:30 +00:00
Benoit Fouet
602dd8f6c4 Check read_packet before using it. 
Originally committed as revision 10588 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-26 11:32:51 +00:00
Panagiotis Issaris
6f3e0b2174 Replace all occurrences of AVERROR_IO with AVERROR(EIO). 
Originally committed as revision 9760 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-19 15:23:32 +00:00
Alex Beregszaszi
5f09770382 cosmetics: fix indentation 
Originally committed as revision 8998 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-11 19:07:40 +00:00
Panagiotis Issaris
a8c5ab2707 Move aviobuf.c comments to avio.h. By moving the aviobuf.c comments to avio.h, 
these comments can be extracted by Doxygen by only accessing the installed
headers.

Originally committed as revision 8258 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-05 13:55:45 +00:00
François Revol
8fa36ae09d This fixes error handling for BeOS, removing the need for some ifdefs. 
AVERROR_ defines are moved to avcodec.h as they are needed in there as well. Feel free to move that to avutil/common.h.
Bumped up avcodec/format version numbers as though it's binary compatible we will want to rebuild apps as error values changed.
Please from now on use return AVERROR(EFOO) instead of the ugly return -EFOO in your code.
This also removes the need for berrno.h.

Originally committed as revision 7965 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-13 18:26:14 +00:00
Ronald S. Bultje
68fcdbf1e5 Fix misbehaviour in url_fseek() when seeking fails. 
The return value of the seek function is -1 on error, not -EPIPE (the return value in url_seek() if no seek function pointer is set)
Patch by Ronald S. Bultje % rbultje A ronald P bitfreak P net %
Original thread:
date: Dec 31, 2006 9:25 PM
subject: [Ffmpeg-devel] Re: [PATCH] file length handling

Originally committed as revision 7766 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-30 10:48:39 +00:00
Ronald S. Bultje
8f42f5238e proper error handling in file size retrieval, patch by Ronald S. Bultje rbultje at ronald bitfreak net 
Originally committed as revision 7736 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-28 02:38:02 +00:00
Michael Niedermayer
1ae2c5f2e7 fix indention of previous commit 
Originally committed as revision 7396 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-01 21:49:50 +00:00
Michael Niedermayer
8e287af090 seekless filesize retrieving support in 7 lines of code, also doesnt break compatibility 
Originally committed as revision 7395 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-01 21:49:09 +00:00
Aurelien Jacobs
3b61ab0b03 put_*() are not only useful to muxers and protocol 
fix compilation of matroska demuxer with --disable-muxers --disable-protocols

Originally committed as revision 7323 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-16 20:40:09 +00:00
Loïc Le Loarer
8fa641f8e8 Fix compile with --disable-muxers, patch by Loïc Le Loarer, lll+ffmpeg m4x org. 
Originally committed as revision 7185 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-30 01:00:12 +00:00
Michael Niedermayer
942f3bb528 move memory reading ByteIOContext init from mov.c to avobuf.c 
Originally committed as revision 6744 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-20 09:32:48 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library' 
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 15:30:46 +00:00
Michael Niedermayer
398f5d3f1d support forward seeking in non seekable streams 
Originally committed as revision 6340 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-26 17:09:03 +00:00
Michael Niedermayer
3b9a913db4 simplify seek() failure check 
Originally committed as revision 6339 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-26 16:09:56 +00:00
Michael Niedermayer
f40d17398d simplify url_fseek() 
Originally committed as revision 6316 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-22 10:03:04 +00:00
Michael Niedermayer
ccb159940b fix regression failure after adler simplification 
Originally committed as revision 5803 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-20 10:22:07 +00:00
Aurelien Jacobs
ea395e8c6c add a Creative VOC (de)muxer 
Originally committed as revision 4967 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-09 22:52:23 +00:00
Gildas Bazin
04f46ced8c Add --disable-protocols option to configure to disable I/O protocol from 
libavformat.  Also fix build with --disable-muxers and --disable-ffserver.
patch by Gildas Bazin < gbazin **@** altern **.** org >

Originally committed as revision 4879 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-21 18:36:32 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address. 
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-12 22:43:26 +00:00
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting 
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-22 01:10:11 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace. 
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-17 18:14:38 +00:00
Diego Biurrun
a9e3509529 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS 
in libavformat to allow building (de)coders and (de)muxers independently at
some point + support for this option in configure.

Originally committed as revision 4611 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-09-23 00:25:41 +00:00
Michael Niedermayer
7cb8f314db remove non portable get/put_be64_double() 
Originally committed as revision 4461 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-19 14:50:22 +00:00
Michael Niedermayer
a254c5745b kill duplicated get/put_be24() 
Originally committed as revision 4460 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-19 14:41:08 +00:00
Michael Niedermayer
0f0680c553 10l (segfault fix) 
Originally committed as revision 4341 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-06-03 08:48:10 +00:00
Wolfram Gloger
536ffa59e9 Fix url_fsize for large files patch by (Wolfram Gloger: wmglo, dent med uni-muenchen de) 
Originally committed as revision 4322 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-30 16:45:08 +00:00