diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-07-23 10:36:42 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-07-23 10:36:42 +0400 |
| commit | 7c67a6e4045516f0fa222e29b03aed8fe8189b7f (patch) | |
| tree | 7ec71cbb4ae095ba401b67c5fd302ff1d66cc845 /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.c | |
| parent | 335f95c6e1384b3c873b0c924f09e3c6d449d013 (diff) | |
Updated ffmpeg
(Thanks to Aleksoid for fixing the unresolved externals when linking)
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2143 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.c')
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.c index 414601697..4b2654256 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/mjpegdec.c @@ -1024,7 +1024,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 = av_be2ne32(id);
len -= 6;
if(s->avctx->debug & FF_DEBUG_STARTCODE){
@@ -1114,7 +1114,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 = av_be2ne32(id);
len -= 4;
if (id == AV_RL32("mjpg")) /* Apple MJPEG-A */
{
|