*** ./libavformat/udp.c.ORIG	Thu Feb  3 13:06:13 2011
--- ./libavformat/udp.c	Thu Feb  3 13:07:24 2011
***************
*** 46,51 ****
--- 46,55 ----
  #define IN6_IS_ADDR_MULTICAST(a) (((uint8_t *) (a))[0] == 0xff)
  #endif
  
+ #if (defined(_AIX51) || defined(_AIX52) || defined(_AIX53)) && !(defined(_AIX61))
+ #define ss_family __ss_family
+ #endif
+ 
  typedef struct {
      int udp_fd;
      int ttl;
*** ./libavcodec/dnxhdenc.c.ORIG	Sat Sep 10 22:05:16 2011
--- ./libavcodec/dnxhdenc.c	Sat Sep 10 22:05:28 2011
***************
*** 36,42 ****
      {"nitris_compat", "encode with Avid Nitris compatibility", offsetof(DNXHDEncContext, nitris_compat), FF_OPT_TYPE_INT, {.dbl = 0}, 0, 1, VE},
  {NULL}
  };
! static const AVClass class = { "dnxhd", av_default_item_name, options, LIBAVUTIL_VERSION_INT };
  
  int dct_quantize_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow);
  
--- 36,42 ----
      {"nitris_compat", "encode with Avid Nitris compatibility", offsetof(DNXHDEncContext, nitris_compat), FF_OPT_TYPE_INT, {.dbl = 0}, 0, 1, VE},
  {NULL}
  };
! static const AVClass AIXclass = { "dnxhd", av_default_item_name, options, LIBAVUTIL_VERSION_INT };
  
  int dct_quantize_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow);
  
***************
*** 872,876 ****
      .capabilities = CODEC_CAP_SLICE_THREADS,
      .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_NONE},
      .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"),
!     .priv_class = &class,
  };
--- 872,876 ----
      .capabilities = CODEC_CAP_SLICE_THREADS,
      .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_NONE},
      .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"),
!     .priv_class = &AIXclass,
  };
*** ./libavcodec/libopencore-amr.c.ORIG	Sat Sep 10 22:09:17 2011
--- ./libavcodec/libopencore-amr.c	Sat Sep 10 22:09:36 2011
***************
*** 92,98 ****
      { NULL }
  };
  
! static const AVClass class = {
      "libopencore_amrnb", av_default_item_name, options, LIBAVUTIL_VERSION_INT
  };
  
--- 92,98 ----
      { NULL }
  };
  
! static const AVClass AIXclass = {
      "libopencore_amrnb", av_default_item_name, options, LIBAVUTIL_VERSION_INT
  };
  
***************
*** 240,246 ****
      NULL,
      .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
      .long_name = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band"),
!     .priv_class = &class,
  };
  
  #endif
--- 240,246 ----
      NULL,
      .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
      .long_name = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band"),
!     .priv_class = &AIXclass,
  };
  
  #endif
*** ./libavcodec/pthread.c.ORIG	Sat Sep 10 22:12:12 2011
--- ./libavcodec/pthread.c	Sat Sep 10 22:12:58 2011
***************
*** 224,230 ****
      return avcodec_thread_execute(avctx, NULL, arg, ret, job_count, 0);
  }
  
! static int thread_init(AVCodecContext *avctx)
  {
      int i;
      ThreadContext *c;
--- 224,230 ----
      return avcodec_thread_execute(avctx, NULL, arg, ret, job_count, 0);
  }
  
! static int AIXthread_init(AVCodecContext *avctx)
  {
      int i;
      ThreadContext *c;
***************
*** 891,897 ****
          validate_thread_parameters(avctx);
  
          if (avctx->active_thread_type&FF_THREAD_SLICE)
!             return thread_init(avctx);
          else if (avctx->active_thread_type&FF_THREAD_FRAME)
              return frame_thread_init(avctx);
      }
--- 891,897 ----
          validate_thread_parameters(avctx);
  
          if (avctx->active_thread_type&FF_THREAD_SLICE)
!             return AIXthread_init(avctx);
          else if (avctx->active_thread_type&FF_THREAD_FRAME)
              return frame_thread_init(avctx);
      }
*** ./libavformat/rtsp.c.ORIG	Sat Sep 10 21:59:44 2011
--- ./libavformat/rtsp.c	Sat Sep 10 22:00:18 2011
***************
*** 55,60 ****
--- 55,64 ----
  #define SDP_MAX_SIZE 16384
  #define RECVBUF_SIZE 10 * RTP_MAX_PACKET_LENGTH
  
+ #if (defined(_AIX51) || defined(_AIX52) || defined(_AIX53)) && !(defined(_AIX61))
+ #define ss_family __ss_family
+ #endif
+ 
  static void get_word_until_chars(char *buf, int buf_size,
                                   const char *sep, const char **pp)
  {
*** ./libavformat/sapenc.c.ORIG	Sat Sep 10 22:00:34 2011
--- ./libavformat/sapenc.c	Sat Sep 10 22:00:47 2011
***************
*** 30,35 ****
--- 30,39 ----
  #include "rtpenc_chain.h"
  #include "url.h"
  
+ #if (defined(_AIX51) || defined(_AIX52) || defined(_AIX53)) && !(defined(_AIX61))
+ #define ss_family __ss_family
+ #endif
+ 
  struct SAPState {
      uint8_t    *ann;
      int         ann_size;
*** ./libavformat/spdifenc.c.ORIG	Sat Sep 10 22:01:17 2011
--- ./libavformat/spdifenc.c	Sat Sep 10 22:01:36 2011
***************
*** 93,99 ****
  { NULL },
  };
  
! static const AVClass class = {
      .class_name     = "spdif",
      .item_name      = av_default_item_name,
      .option         = options,
--- 93,99 ----
  { NULL },
  };
  
! static const AVClass AIXclass = {
      .class_name     = "spdif",
      .item_name      = av_default_item_name,
      .option         = options,
***************
*** 552,556 ****
      spdif_write_packet,
      spdif_write_trailer,
      .flags = AVFMT_NOTIMESTAMPS,
!     .priv_class = &class,
  };
--- 552,556 ----
      spdif_write_packet,
      spdif_write_trailer,
      .flags = AVFMT_NOTIMESTAMPS,
!     .priv_class = &AIXclass,
  };
*** ./libavutil/eval.c.ORIG	Sat Sep 10 22:16:13 2011
--- ./libavutil/eval.c	Sat Sep 10 22:16:56 2011
***************
*** 46,52 ****
      double var[VARS];
  } Parser;
  
! static const AVClass class = { "Eval", av_default_item_name, NULL, LIBAVUTIL_VERSION_INT, offsetof(Parser,log_offset), offsetof(Parser,log_ctx) };
  
  static const int8_t si_prefixes['z' - 'E' + 1] = {
      ['y'-'E']= -24,
--- 46,52 ----
      double var[VARS];
  } Parser;
  
! static const AVClass AIXclass = { "Eval", av_default_item_name, NULL, LIBAVUTIL_VERSION_INT, offsetof(Parser,log_offset), offsetof(Parser,log_ctx) };
  
  static const int8_t si_prefixes['z' - 'E' + 1] = {
      ['y'-'E']= -24,
***************
*** 474,480 ****
          if (!isspace(*s++)) *wp++ = s[-1];
      *wp++ = 0;
  
!     p.class      = &class;
      p.stack_index=100;
      p.s= w;
      p.const_names = const_names;
--- 474,480 ----
          if (!isspace(*s++)) *wp++ = s[-1];
      *wp++ = 0;
  
!     p.class      = &AIXclass;
      p.stack_index=100;
      p.s= w;
      p.const_names = const_names;
*** ./configure.ORIG	Sun Jan 15 19:46:46 2012
--- ./configure	Fri Mar 23 09:07:05 2012
***************
*** 1002,1007 ****
--- 1002,1008 ----
  '
  
  ARCH_LIST='
+     AIX
      alpha
      arm
      avr32
***************
*** 1665,1671 ****
  nogas=":"
  
  # machine
! arch_default=$(uname -m)
  cpu="generic"
  
  # OS
--- 1666,1672 ----
  nogas=":"
  
  # machine
! arch_default=$(uname -s)
  cpu="generic"
  
  # OS
***************
*** 1695,1701 ****
  
  # build settings
  SHFLAGS='-shared -Wl,-soname,$$(@F)'
! AVSERVERLDFLAGS=-Wl,-E
  LIBPREF="lib"
  LIBSUF=".a"
  FULLNAME='$(NAME)$(BUILDSUF)'
--- 1695,1701 ----
  
  # build settings
  SHFLAGS='-shared -Wl,-soname,$$(@F)'
! AVSERVERLDFLAGS=
  LIBPREF="lib"
  LIBSUF=".a"
  FULLNAME='$(NAME)$(BUILDSUF)'
***************
*** 2579,2584 ****
--- 2580,2587 ----
                        -l:drtaeabi.dso -l:scppnwdl.dso -lsupc++ -lgcc \
                        -l:libc.dso -l:libm.dso -l:euser.dso -l:libcrt0.lib
          ;;
+     aix)
+         ;;
      none)
          ;;
      *)
***************
*** 3067,3073 ****
  # add some linker flags
  check_ldflags -Wl,--warn-common
  check_ldflags -Wl,-rpath-link=libpostproc:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil
- test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
  
  echo "X{};" > $TMPV
  if test_ldflags -Wl,--version-script,$TMPV; then
--- 3070,3075 ----
*** ./libavcodec/libvorbis.c.ORIG	Wed Jan 11 11:43:03 2012
--- ./libavcodec/libvorbis.c	Fri Mar 23 09:09:40 2012
***************
*** 59,65 ****
      { "iblock", "Sets the impulse block bias", offsetof(OggVorbisContext, iblock), AV_OPT_TYPE_DOUBLE, { .dbl = 0 }, -15, 0, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM },
      { NULL }
  };
! static const AVClass class = { "libvorbis", av_default_item_name, options, LIBAVUTIL_VERSION_INT };
  
  static av_cold int oggvorbis_init_encoder(vorbis_info *vi, AVCodecContext *avccontext)
  {
--- 59,65 ----
      { "iblock", "Sets the impulse block bias", offsetof(OggVorbisContext, iblock), AV_OPT_TYPE_DOUBLE, { .dbl = 0 }, -15, 0, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM },
      { NULL }
  };
! static const AVClass AIXclass = { "libvorbis", av_default_item_name, options, LIBAVUTIL_VERSION_INT };
  
  static av_cold int oggvorbis_init_encoder(vorbis_info *vi, AVCodecContext *avccontext)
  {
***************
*** 261,265 ****
      .capabilities   = CODEC_CAP_DELAY,
      .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE },
      .long_name      = NULL_IF_CONFIG_SMALL("libvorbis Vorbis"),
!     .priv_class     = &class,
  };
--- 261,265 ----
      .capabilities   = CODEC_CAP_DELAY,
      .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE },
      .long_name      = NULL_IF_CONFIG_SMALL("libvorbis Vorbis"),
!     .priv_class     = &AIXclass,
  };
*** ./libavcodec/g726.c.ORIG	Fri Mar 23 09:40:50 2012
--- ./libavcodec/g726.c	Fri Mar 23 09:41:06 2012
***************
*** 74,80 ****
  } G726Tables;
  
  typedef struct G726Context {
!     AVClass *class;
      AVFrame frame;
      G726Tables tbls;    /**< static tables needed for computation */
  
--- 74,80 ----
  } G726Tables;
  
  typedef struct G726Context {
!     AVClass *AIXclass;
      AVFrame frame;
      G726Tables tbls;    /**< static tables needed for computation */
  
***************
*** 373,379 ****
      { NULL },
  };
  
! static const AVClass class = {
      .class_name = "g726",
      .item_name  = av_default_item_name,
      .option     = options,
--- 373,379 ----
      { NULL },
  };
  
! static const AVClass AIXclass = {
      .class_name = "g726",
      .item_name  = av_default_item_name,
      .option     = options,
***************
*** 396,402 ****
      .capabilities = CODEC_CAP_SMALL_LAST_FRAME,
      .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
      .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"),
!     .priv_class     = &class,
      .defaults       = defaults,
  };
  #endif
--- 396,402 ----
      .capabilities = CODEC_CAP_SMALL_LAST_FRAME,
      .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
      .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"),
!     .priv_class     = &AIXclass,
      .defaults       = defaults,
  };
  #endif
*** ./libavcodec/libspeexenc.c.ORIG	Fri Mar 23 09:49:52 2012
--- ./libavcodec/libspeexenc.c	Fri Mar 23 09:50:05 2012
***************
*** 73,79 ****
  #include "internal.h"
  
  typedef struct {
!     AVClass *class;             ///< AVClass for private options
      SpeexBits bits;             ///< libspeex bitwriter context
      SpeexHeader header;         ///< libspeex header struct
      void *enc_state;            ///< libspeex encoder state
--- 73,79 ----
  #include "internal.h"
  
  typedef struct {
!     AVClass *AIXclass;             ///< AVClass for private options
      SpeexBits bits;             ///< libspeex bitwriter context
      SpeexHeader header;         ///< libspeex header struct
      void *enc_state;            ///< libspeex encoder state
***************
*** 297,303 ****
      { NULL },
  };
  
! static const AVClass class = {
      .class_name = "libspeex",
      .item_name  = av_default_item_name,
      .option     = options,
--- 297,303 ----
      { NULL },
  };
  
! static const AVClass AIXclass = {
      .class_name = "libspeex",
      .item_name  = av_default_item_name,
      .option     = options,
***************
*** 321,326 ****
      .capabilities   = CODEC_CAP_DELAY,
      .sample_fmts    = (const enum SampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE },
      .long_name      = NULL_IF_CONFIG_SMALL("libspeex Speex"),
!     .priv_class     = &class,
      .defaults       = defaults,
  };
--- 321,326 ----
      .capabilities   = CODEC_CAP_DELAY,
      .sample_fmts    = (const enum SampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE },
      .long_name      = NULL_IF_CONFIG_SMALL("libspeex Speex"),
!     .priv_class     = &AIXclass,
      .defaults       = defaults,
  };
*** ./libavcodec/libvpxenc.c.ORIG	Fri Mar 23 09:51:21 2012
--- ./libavcodec/libvpxenc.c	Fri Mar 23 09:51:40 2012
***************
*** 50,56 ****
  };
  
  typedef struct VP8EncoderContext {
!     AVClass *class;
      struct vpx_codec_ctx encoder;
      struct vpx_image rawimg;
      struct vpx_fixed_buf twopass_stats;
--- 50,56 ----
  };
  
  typedef struct VP8EncoderContext {
!     AVClass *AIXclass;
      struct vpx_codec_ctx encoder;
      struct vpx_image rawimg;
      struct vpx_fixed_buf twopass_stats;
***************
*** 549,555 ****
      { NULL }
  };
  
! static const AVClass class = {
      .class_name = "libvpx encoder",
      .item_name  = av_default_item_name,
      .option     = options,
--- 549,555 ----
      { NULL }
  };
  
! static const AVClass AIXclass = {
      .class_name = "libvpx encoder",
      .item_name  = av_default_item_name,
      .option     = options,
***************
*** 575,580 ****
      .capabilities   = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS,
      .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
      .long_name = NULL_IF_CONFIG_SMALL("libvpx VP8"),
!     .priv_class = &class,
      .defaults       = defaults,
  };
--- 575,580 ----
      .capabilities   = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS,
      .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
      .long_name = NULL_IF_CONFIG_SMALL("libvpx VP8"),
!     .priv_class = &AIXclass,
      .defaults       = defaults,
  };
*** ./libavcodec/libx264.c.ORIG	Fri Mar 23 09:50:24 2012
--- ./libavcodec/libx264.c	Fri Mar 23 09:50:39 2012
***************
*** 31,37 ****
  #include <string.h>
  
  typedef struct X264Context {
!     AVClass        *class;
      x264_param_t    params;
      x264_t         *enc;
      x264_picture_t  pic;
--- 31,37 ----
  #include <string.h>
  
  typedef struct X264Context {
!     AVClass        *AIXclass;
      x264_param_t    params;
      x264_t         *enc;
      x264_picture_t  pic;
***************
*** 556,562 ****
      { NULL },
  };
  
! static const AVClass class = {
      .class_name = "libx264",
      .item_name  = av_default_item_name,
      .option     = options,
--- 556,562 ----
      { NULL },
  };
  
! static const AVClass AIXclass = {
      .class_name = "libx264",
      .item_name  = av_default_item_name,
      .option     = options,
***************
*** 597,603 ****
      .close          = X264_close,
      .capabilities   = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS,
      .long_name      = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
!     .priv_class     = &class,
      .defaults       = x264_defaults,
      .init_static_data = X264_init_static,
  };
--- 597,603 ----
      .close          = X264_close,
      .capabilities   = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS,
      .long_name      = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
!     .priv_class     = &AIXclass,
      .defaults       = x264_defaults,
      .init_static_data = X264_init_static,
  };
*** ./libavformat/gsmdec.c.ORIG	Fri Mar 23 09:27:57 2012
--- ./libavformat/gsmdec.c	Fri Mar 23 09:28:12 2012
***************
*** 29,35 ****
  #define GSM_SAMPLE_RATE   8000
  
  typedef struct {
!     AVClass *class;
      int sample_rate;
  } GSMDemuxerContext;
  
--- 29,35 ----
  #define GSM_SAMPLE_RATE   8000
  
  typedef struct {
!     AVClass *AIXclass;
      int sample_rate;
  } GSMDemuxerContext;
  
***************
*** 79,85 ****
      { NULL },
  };
  
! static const AVClass class = {
      .class_name = "gsm demuxer",
      .item_name  = av_default_item_name,
      .option     = options,
--- 79,85 ----
      { NULL },
  };
  
! static const AVClass AIXclass = {
      .class_name = "gsm demuxer",
      .item_name  = av_default_item_name,
      .option     = options,
***************
*** 95,99 ****
      .flags          = AVFMT_GENERIC_INDEX,
      .extensions     = "gsm",
      .value          = CODEC_ID_GSM,
!     .priv_class     = &class,
  };
--- 95,99 ----
      .flags          = AVFMT_GENERIC_INDEX,
      .extensions     = "gsm",
      .value          = CODEC_ID_GSM,
!     .priv_class     = &AIXclass,
  };