virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
Code Issues Releases Activity

avformat/xwma: improve error codes

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-29 20:44:07 +02:00
parent c31ad87bc6
commit cf4dbe9aff
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/xwma.c
View File

@ -131,7 +131,7 @@ static int xwma_read_header(AVFormatContext *s)
/* parse the remaining RIFF chunks */ /* parse the remaining RIFF chunks */
for (;;) { for (;;) {
if (pb->eof_reached) if (pb->eof_reached)
return -1; return AVERROR_EOF;
/* read next chunk tag */ /* read next chunk tag */
tag = avio_rl32(pb); tag = avio_rl32(pb);
size = avio_rl32(pb); size = avio_rl32(pb);
@ -152,7 +152,7 @@ static int xwma_read_header(AVFormatContext *s)
/* Error out if there is more than one dpds chunk. */ /* Error out if there is more than one dpds chunk. */
if (dpds_table) { if (dpds_table) {
av_log(s, AV_LOG_ERROR, "two dpds chunks present\n"); av_log(s, AV_LOG_ERROR, "two dpds chunks present\n");
return -1; return AVERROR_INVALIDDATA;
} }
/* Compute the number of entries in the dpds chunk. */ /* Compute the number of entries in the dpds chunk. */
@ -164,7 +164,7 @@ static int xwma_read_header(AVFormatContext *s)
if (dpds_table_size == 0 || dpds_table_size >= INT_MAX / 4) { if (dpds_table_size == 0 || dpds_table_size >= INT_MAX / 4) {
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
"dpds chunk size %"PRId64" invalid\n", size); "dpds chunk size %"PRId64" invalid\n", size);
return -1; return AVERROR_INVALIDDATA;
} }
/* Allocate some temporary storage to keep the dpds data around. /* Allocate some temporary storage to keep the dpds data around.
@ -185,7 +185,7 @@ static int xwma_read_header(AVFormatContext *s)
/* Determine overall data length */ /* Determine overall data length */
if (size < 0) if (size < 0)
return -1; return AVERROR_INVALIDDATA;
if (!size) { if (!size) {
xwma->data_end = INT64_MAX; xwma->data_end = INT64_MAX;
} else } else