Merge remote-tracking branch 'qatar/master'

* qatar/master: (34 commits)
  mlp_parser: fix the channel mask value used for the top surround channel
  vorbisenc: check all allocations for failure
  roqaudioenc: return AVERROR codes instead of -1
  roqaudioenc: set correct bit rate
  roqaudioenc: use AVCodecContext.frame_size correctly.
  roqaudioenc: remove unneeded sample_fmt check
  ra144enc: use int16_t* for input samples rather than void*
  ra144enc: set AVCodecContext.coded_frame
  ra144enc: remove unneeded sample_fmt check
  nellymoserenc: set AVCodecContext.coded_frame
  nellymoserenc: improve error checking in encode_init()
  nellymoserenc: return AVERROR codes instead of -1
  libvorbis: improve error checking in oggvorbis_encode_init()
  mpegaudioenc: return AVERROR codes instead of -1
  libfaac: improve error checking and handling in Faac_encode_init()
  avutil: add AVERROR_UNKNOWN
  check for coded_frame allocation failure in several audio encoders
  audio encoders: do not set coded_frame->key_frame.
  g722enc: check for trellis data allocation error
  libspeexenc: export encoder delay through AVCodecContext.delay
  ...

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/fraps.c
	libavcodec/kgv1dec.c
	libavcodec/libfaac.c
	libavcodec/libgsm.c
	libavcodec/libvorbis.c
	libavcodec/mlp_parser.c
	libavcodec/roqaudioenc.c
	libavcodec/vorbisenc.c
	libavutil/avutil.h
	libavutil/error.c
	libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 2 insertions, 2 deletions

diff --git a/libavcodec/cdxl.c b/libavcodec/cdxl.c
index a854634..6bf30cf 100644
--- a/libavcodec/cdxl.c
+++ b/libavcodec/cdxl.c
@@ -122,7 +122,7 @@ static void cdxl_decode_ham6(CDXLVideoContext *c)
                 g = index * 0x11 << 8;
                 break;
             }
-            AV_WN32(out + x * 3, r | g | b);
+            AV_WL24(out + x * 3, r | g | b);
         }
         out += c->frame.linesize[0];
     }
@@ -165,7 +165,7 @@ static void cdxl_decode_ham8(CDXLVideoContext *c)
                 g = (index << 10) | (g & (3 << 8));
                 break;
             }
-            AV_WN32(out + x * 3, r | g | b);
+            AV_WL24(out + x * 3, r | g | b);
         }
         out += c->frame.linesize[0];
     }