summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorBenoit Fouet <benoit.fouet@free.fr>2007-11-08 09:14:09 +0000
committerBenoit Fouet <benoit.fouet@free.fr>2007-11-08 09:14:09 +0000
commit36c9e40ab41f22c795de3c5302475515227ece60 (patch)
tree62b71bb02cb6c8c467c356e72fd0ac8c8bef8a17 /libavformat
parent8cd4ac3d63abff11201810aff9f3521876c2fb70 (diff)
Change ff_rm_read_mdpr_codecdata to get back to old behavior.
Originally committed as revision 10954 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/rmdec.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index c12aa97cdd..3f781d5659 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -193,7 +193,7 @@ ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVStream *st)
{
ByteIOContext *pb = &s->pb;
unsigned int v;
- int codec_data_size, size, res = -1;
+ int codec_data_size, size;
int64_t codec_pos;
codec_data_size = get_be32(pb);
@@ -247,13 +247,12 @@ ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVStream *st)
}
}
- res = 0;
skip:
/* skip codec info */
size = url_ftell(pb) - codec_pos;
url_fskip(pb, codec_data_size - size);
- return res;
+ return 0;
}