[FFmpeg-cvslog] png_parser: try to fix big endian
Michael Niedermayer
git at videolan.org
Sat May 5 02:16:46 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 5 02:12:40 2012 +0200| [3d42addf336739a69aee47891413a46e4f64995b] | committer: Michael Niedermayer
png_parser: try to fix big endian
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d42addf336739a69aee47891413a46e4f64995b
---
libavcodec/png_parser.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/libavcodec/png_parser.c b/libavcodec/png_parser.c
index c76ed68..7f6fabb 100644
--- a/libavcodec/png_parser.c
+++ b/libavcodec/png_parser.c
@@ -24,7 +24,6 @@
* PNG parser
*/
-#include "libavutil/intreadwrite.h"
#include "parser.h"
#define PNGSIG 0x89504e470d0a1a0a
@@ -76,7 +75,7 @@ static int png_parse(AVCodecParserContext *s, AVCodecContext *avctx,
for (;ppc->pc.frame_start_found && i < buf_size; i++) {
ppc->pc.state = (ppc->pc.state<<8) | buf[i];
if (ppc->index == 3) {
- ppc->chunk_length = AV_RL32(&ppc->pc.state);
+ ppc->chunk_length = ppc->pc.state;
if (ppc->chunk_length > 0x7fffffff) {
ppc->index = ppc->pc.frame_start_found = 0;
goto flush;
@@ -85,7 +84,7 @@ static int png_parse(AVCodecParserContext *s, AVCodecContext *avctx,
} else if (ppc->index == 7) {
if (ppc->chunk_length >= buf_size - i)
ppc->remaining_size = ppc->chunk_length - buf_size + i + 1;
- if (AV_RB32(&ppc->pc.state) == MKTAG('I', 'E', 'N', 'D')) {
+ if (ppc->pc.state == MKBETAG('I', 'E', 'N', 'D')) {
if (ppc->remaining_size)
ppc->index = -1;
else
More information about the ffmpeg-cvslog
mailing list