summaryrefslogtreecommitdiff
path: root/libavcodec/mjpegdec.c
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-07-10 22:09:01 +0000
committerMåns Rullgård <mans@mansr.com>2010-07-10 22:09:01 +0000
commite6b22522c94cfccda97018e52ab65da8c69d8a56 (patch)
tree4ecb09a4ae3f895d70ab882d841347d943eef0a2 /libavcodec/mjpegdec.c
parent6b7917ba3ba16cbbcc81d9e007b26f82dd06400f (diff)
downloadffmpeg-e6b22522c94cfccda97018e52ab65da8c69d8a56.tar.gz
bswap: change ME to NE in macro names
Other parts of FFmpeg use NE (native endian) rather than ME (machine). This makes it consistent. Originally committed as revision 24169 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mjpegdec.c')
-rw-r--r--libavcodec/mjpegdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 47f5a0eb4e..477ef973aa 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1027,7 +1027,7 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
return -1;
id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16);
- id = be2me_32(id);
+ id = be2ne_32(id);
len -= 6;
if(s->avctx->debug & FF_DEBUG_STARTCODE){
@@ -1134,7 +1134,7 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
if ((s->start_code == APP1) && (len > (0x28 - 8)))
{
id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16);
- id = be2me_32(id);
+ id = be2ne_32(id);
len -= 4;
if (id == AV_RL32("mjpg")) /* Apple MJPEG-A */
{