From 269b94e34656eaf3f237ee1528826f3b9a1940cf Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
Date: Mon, 15 Oct 2007 22:47:41 +0000
Subject: [PATCH] simplify bitstream reading
Originally committed as revision 10745 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/electronicarts.c | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c
index 871a2f75fe4..19e12ed72bd 100644
--- a/libavformat/electronicarts.c
+++ b/libavformat/electronicarts.c
@@ -83,22 +83,10 @@ static int process_ea_header(AVFormatContext *s) {
EaDemuxContext *ea = s->priv_data;
ByteIOContext *pb = &s->pb;
- if (get_buffer(pb, (void*)&blockid, 4) != 4) {
+ if (get_le32(pb) != SCHl_TAG)
return 0;
- }
- if (le2me_32(blockid) != SCHl_TAG) {
- return 0;
- }
-
- if (get_buffer(pb, (void*)&size, 4) != 4) {
- return 0;
- }
- size = le2me_32(size);
-
- if (get_buffer(pb, (void*)&blockid, 4) != 4) {
- return 0;
- }
- if (le2me_32(blockid) != PT00_TAG) {
+ size = get_le32(pb);
+ if (get_le32(pb) != PT00_TAG) {
av_log (s, AV_LOG_ERROR, "PT header missing\n");
return 0;
}
--
GitLab