virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
Code Issues Releases Activity

avio: deprecate url_ferror

Browse Source 
AVIOContext.error should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Anton Khirnov 2011-03-14 20:38:55 +01:00 committed by Ronald S. Bultje
parent 75b9ed04b9
commit 3e68b3ba7b
7 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffplay.c
View File

@ -2570,7 +2570,7 @@ static int decode_thread(void *arg)
if (ret < 0) { if (ret < 0) {
if (ret == AVERROR_EOF || ic->pb->eof_reached) if (ret == AVERROR_EOF || ic->pb->eof_reached)
eof=1; eof=1;
if (url_ferror(ic->pb)) if (ic->pb->error)
break; break;
SDL_Delay(100); /* wait for user event */ SDL_Delay(100); /* wait for user event */
continue; continue;

2
libavformat/asfdec.c
View File

@ -743,7 +743,7 @@ static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb)
* imply complete -EAGAIN handling support at random positions in * imply complete -EAGAIN handling support at random positions in
* the stream. * the stream.
*/ */
if (url_ferror(pb) == AVERROR(EAGAIN)) if (pb->error == AVERROR(EAGAIN))
return AVERROR(EAGAIN); return AVERROR(EAGAIN);
if (!pb->eof_reached) if (!pb->eof_reached)
av_log(s, AV_LOG_ERROR, "ff asf bad header %x at:%"PRId64"\n", c, avio_tell(pb)); av_log(s, AV_LOG_ERROR, "ff asf bad header %x at:%"PRId64"\n", c, avio_tell(pb));

3
libavformat/avio.h
View File

@ -437,6 +437,7 @@ attribute_deprecated int url_fgetc(AVIOContext *s);
* @deprecated use AVIOContext.eof_reached * @deprecated use AVIOContext.eof_reached
*/ */
attribute_deprecated int url_feof(AVIOContext *s); attribute_deprecated int url_feof(AVIOContext *s);
attribute_deprecated int url_ferror(AVIOContext *s);
#endif #endif
AVIOContext *avio_alloc_context( AVIOContext *avio_alloc_context(
@ -499,8 +500,6 @@ int64_t avio_seek(AVIOContext *s, int64_t offset, int whence);
*/ */
int64_t avio_size(AVIOContext *s); int64_t avio_size(AVIOContext *s);
int url_ferror(AVIOContext *s);
int av_url_read_fpause(AVIOContext *h, int pause); int av_url_read_fpause(AVIOContext *h, int pause);
int64_t av_url_read_fseek(AVIOContext *h, int stream_index, int64_t av_url_read_fseek(AVIOContext *h, int stream_index,
int64_t timestamp, int flags); int64_t timestamp, int flags);

6
libavformat/aviobuf.c
View File

@ -272,7 +272,6 @@ int url_feof(AVIOContext *s)
return 0; return 0;
return s->eof_reached; return s->eof_reached;
} }
#endif
int url_ferror(AVIOContext *s) int url_ferror(AVIOContext *s)
{ {
@ -280,6 +279,7 @@ int url_ferror(AVIOContext *s)
return 0; return 0;
return s->error; return s->error;
} }
#endif
void avio_wl32(AVIOContext *s, unsigned int val) void avio_wl32(AVIOContext *s, unsigned int val)
{ {
@ -599,7 +599,7 @@ int avio_read(AVIOContext *s, unsigned char *buf, int size)
} }
} }
if (size1 == size) { if (size1 == size) {
if (url_ferror(s)) return url_ferror(s); if (s->error) return s->error;
if (s->eof_reached) return AVERROR_EOF; if (s->eof_reached) return AVERROR_EOF;
} }
return size1 - size; return size1 - size;
@ -622,7 +622,7 @@ int ffio_read_partial(AVIOContext *s, unsigned char *buf, int size)
memcpy(buf, s->buf_ptr, len); memcpy(buf, s->buf_ptr, len);
s->buf_ptr += len; s->buf_ptr += len;
if (!len) { if (!len) {
if (url_ferror(s)) return url_ferror(s); if (s->error) return s->error;
if (s->eof_reached) return AVERROR_EOF; if (s->eof_reached) return AVERROR_EOF;
} }
return len; return len;

2
libavformat/dsicin.c
View File

@ -147,7 +147,7 @@ static int cin_read_frame_header(CinDemuxContext *cin, AVIOContext *pb) {
hdr->video_frame_size = avio_rl32(pb); hdr->video_frame_size = avio_rl32(pb);
hdr->audio_frame_size = avio_rl32(pb); hdr->audio_frame_size = avio_rl32(pb);
if (pb->eof_reached || url_ferror(pb)) if (pb->eof_reached || pb->error)
return AVERROR(EIO); return AVERROR(EIO);
if (avio_rl32(pb) != 0xAA55AA55) if (avio_rl32(pb) != 0xAA55AA55)

2
libavformat/mxg.c
View File

@ -132,7 +132,7 @@ static int mxg_read_packet(AVFormatContext *s, AVPacket *pkt)
uint8_t *startmarker_ptr, *end, *search_end, marker; uint8_t *startmarker_ptr, *end, *search_end, marker;
MXGContext *mxg = s->priv_data; MXGContext *mxg = s->priv_data;
while (!s->pb->eof_reached && !url_ferror(s->pb)){ while (!s->pb->eof_reached && !s->pb->error){
if (mxg->cache_size <= OVERREAD_SIZE) { if (mxg->cache_size <= OVERREAD_SIZE) {
/* update internal buffer */ /* update internal buffer */
ret = mxg_update_cache(s, DEFAULT_PACKET_SIZE + OVERREAD_SIZE); ret = mxg_update_cache(s, DEFAULT_PACKET_SIZE + OVERREAD_SIZE);

2
libavformat/wtv.c
View File

@ -77,7 +77,7 @@ static int wtvfile_read_packet(void *opaque, uint8_t *buf, int buf_size)
AVIOContext *pb = wf->pb_filesystem; AVIOContext *pb = wf->pb_filesystem;
int nread = 0; int nread = 0;
if (wf->error || url_ferror(pb)) if (wf->error || pb->error)
return -1; return -1;
if (wf->position >= wf->length || pb->eof_reached) if (wf->position >= wf->length || pb->eof_reached)
return 0; return 0;