@@ -61,7 +61,8 @@ static FILE *report_file;

 void init_opts(void)

 {

 #if CONFIG_SWSCALE

-    sws_opts = sws_getContext(16, 16, 0, 16, 16, 0, SWS_BICUBIC, NULL, NULL, NULL);

+    sws_opts = sws_getContext(16, 16, 0, 16, 16, 0, SWS_BICUBIC,

+                              NULL, NULL, NULL);

 #endif

 }

@@ -75,7 +76,7 @@ void uninit_opts(void)

     av_dict_free(&codec_opts);

 }

-void log_callback_help(void* ptr, int level, const char* fmt, va_list vl)

+void log_callback_help(void *ptr, int level, const char *fmt, va_list vl)

 {

     vfprintf(stdout, fmt, vl);

 }

@@ -94,19 +95,20 @@ static void log_callback_report(void *ptr, int level, const char *fmt, va_list v

     fflush(report_file);

 }

-double parse_number_or_die(const char *context, const char *numstr, int type, double min, double max)

+double parse_number_or_die(const char *context, const char *numstr, int type,

+                           double min, double max)

 {

     char *tail;

     const char *error;

     double d = av_strtod(numstr, &tail);

     if (*tail)

-        error= "Expected number for %s but found: %s\n";

+        error = "Expected number for %s but found: %s\n";

     else if (d < min || d > max)

-        error= "The value for %s was %s which is not within %f - %f\n";

-    else if(type == OPT_INT64 && (int64_t)d != d)

-        error= "Expected int64 for %s but found %s\n";

+        error = "The value for %s was %s which is not within %f - %f\n";

+    else if (type == OPT_INT64 && (int64_t)d != d)

+        error = "Expected int64 for %s but found %s\n";

     else if (type == OPT_INT && (int)d != d)

-        error= "Expected int for %s but found %s\n";

+        error = "Expected int for %s but found %s\n";

     else

         return d;

     av_log(NULL, AV_LOG_FATAL, error, context, numstr, min, max);

@@ -114,7 +116,8 @@ double parse_number_or_die(const char *context, const char *numstr, int type, do

     return 0;

 }

-int64_t parse_time_or_die(const char *context, const char *timestr, int is_duration)

+int64_t parse_time_or_die(const char *context, const char *timestr,

+                          int is_duration)

 {

     int64_t us;

     if (av_parse_time(&us, timestr, is_duration) < 0) {

@@ -125,13 +128,14 @@ int64_t parse_time_or_die(const char *context, const char *timestr, int is_durat

     return us;

 }

-void show_help_options(const OptionDef *options, const char *msg, int mask, int value)

+void show_help_options(const OptionDef *options, const char *msg, int mask,

+                       int value)

 {

     const OptionDef *po;

     int first;

     first = 1;

-    for(po = options; po->name != NULL; po++) {

+    for (po = options; po->name != NULL; po++) {

         char buf[64];

         if ((po->flags & mask) == value) {

             if (first) {

@@ -158,7 +162,8 @@ void show_help_children(const AVClass *class, int flags)

         show_help_children(child, flags);

 }

-static const OptionDef* find_option(const OptionDef *po, const char *name){

+static const OptionDef *find_option(const OptionDef *po, const char *name)

+{

     const char *p = strchr(name, ':');

     int len = p ? p - name : strlen(name);

@@ -205,8 +210,8 @@ static void prepare_app_arguments(int *argc_ptr, char ***argv_ptr)

         buffsize += WideCharToMultiByte(CP_UTF8, 0, argv_w[i], -1,

                                         NULL, 0, NULL, NULL);

-    win32_argv_utf8 = av_mallocz(sizeof(char*) * (win32_argc + 1) + buffsize);

-    argstr_flat     = (char*)win32_argv_utf8 + sizeof(char*) * (win32_argc + 1);

+    win32_argv_utf8 = av_mallocz(sizeof(char *) * (win32_argc + 1) + buffsize);

+    argstr_flat     = (char *)win32_argv_utf8 + sizeof(char *) * (win32_argc + 1);

     if (win32_argv_utf8 == NULL) {

         LocalFree(argv_w);

         return;

@@ -231,8 +236,8 @@ static inline void prepare_app_arguments(int *argc_ptr, char ***argv_ptr)

 }

 #endif /* WIN32 && !__MINGW32CE__ */

-

-int parse_option(void *optctx, const char *opt, const char *arg, const OptionDef *options)

+int parse_option(void *optctx, const char *opt, const char *arg,

+                 const OptionDef *options)

 {

     const OptionDef *po;

     int bool_val = 1;

@@ -261,13 +266,14 @@ unknown_opt:

     /* new-style options contain an offset into optctx, old-style address of

      * a global var*/

-    dst = po->flags & (OPT_OFFSET|OPT_SPEC) ? (uint8_t*)optctx + po->u.off : po->u.dst_ptr;

+    dst = po->flags & (OPT_OFFSET | OPT_SPEC) ? (uint8_t *)optctx + po->u.off

+                                              : po->u.dst_ptr;

     if (po->flags & OPT_SPEC) {

         SpecifierOpt **so = dst;

         char *p = strchr(opt, ':');

-        dstcount = (int*)(so + 1);

+        dstcount = (int *)(so + 1);

         *so = grow_array(*so, sizeof(**so), dstcount, *dstcount + 1);

         (*so)[*dstcount - 1].specifier = av_strdup(p ? p + 1 : "");

         dst = &(*so)[*dstcount - 1].u;

@@ -276,24 +282,25 @@ unknown_opt:

     if (po->flags & OPT_STRING) {

         char *str;

         str = av_strdup(arg);

-        *(char**)dst = str;

+        *(char **)dst = str;

     } else if (po->flags & OPT_BOOL) {

-        *(int*)dst = bool_val;

+        *(int *)dst = bool_val;

     } else if (po->flags & OPT_INT) {

-        *(int*)dst = parse_number_or_die(opt, arg, OPT_INT64, INT_MIN, INT_MAX);

+        *(int *)dst = parse_number_or_die(opt, arg, OPT_INT64, INT_MIN, INT_MAX);

     } else if (po->flags & OPT_INT64) {

-        *(int64_t*)dst = parse_number_or_die(opt, arg, OPT_INT64, INT64_MIN, INT64_MAX);

+        *(int64_t *)dst = parse_number_or_die(opt, arg, OPT_INT64, INT64_MIN, INT64_MAX);

     } else if (po->flags & OPT_TIME) {

-        *(int64_t*)dst = parse_time_or_die(opt, arg, 1);

+        *(int64_t *)dst = parse_time_or_die(opt, arg, 1);

     } else if (po->flags & OPT_FLOAT) {

-        *(float*)dst = parse_number_or_die(opt, arg, OPT_FLOAT, -INFINITY, INFINITY);

+        *(float *)dst = parse_number_or_die(opt, arg, OPT_FLOAT, -INFINITY, INFINITY);

     } else if (po->flags & OPT_DOUBLE) {

-        *(double*)dst = parse_number_or_die(opt, arg, OPT_DOUBLE, -INFINITY, INFINITY);

+        *(double *)dst = parse_number_or_die(opt, arg, OPT_DOUBLE, -INFINITY, INFINITY);

     } else if (po->u.func_arg) {

-        int ret = po->flags & OPT_FUNC2 ? po->u.func2_arg(optctx, opt, arg) :

-                                          po->u.func_arg(opt, arg);

+        int ret = po->flags & OPT_FUNC2 ? po->u.func2_arg(optctx, opt, arg)

+                                        : po->u.func_arg(opt, arg);

         if (ret < 0) {

-            av_log(NULL, AV_LOG_ERROR, "Failed to set value '%s' for option '%s'\n", arg, opt);

+            av_log(NULL, AV_LOG_ERROR,

+                   "Failed to set value '%s' for option '%s'\n", arg, opt);

             return ret;

         }

     }

@@ -303,7 +310,7 @@ unknown_opt:

 }

 void parse_options(void *optctx, int argc, char **argv, const OptionDef *options,

-                   void (* parse_arg_function)(void *, const char*))

+                   void (*parse_arg_function)(void *, const char*))

 {

     const char *opt;

     int optindex, handleoptions = 1, ret;

@@ -336,7 +343,8 @@ void parse_options(void *optctx, int argc, char **argv, const OptionDef *options

 /*

  * Return index of option opt in argv or 0 if not found.

  */

-static int locate_option(int argc, char **argv, const OptionDef *options, const char *optname)

+static int locate_option(int argc, char **argv, const OptionDef *options,

+                         const char *optname)

 {

     const OptionDef *po;

     int i;

@@ -419,15 +427,18 @@ int opt_default(const char *opt, const char *arg)

         p = opt + strlen(opt);

     av_strlcpy(opt_stripped, opt, FFMIN(sizeof(opt_stripped), p - opt + 1));

-    if ((oc = av_opt_find(&cc, opt_stripped, NULL, 0, AV_OPT_SEARCH_CHILDREN|AV_OPT_SEARCH_FAKE_OBJ)) ||

-         ((opt[0] == 'v' || opt[0] == 'a' || opt[0] == 's') &&

-          (oc = av_opt_find(&cc, opt+1, NULL, 0, AV_OPT_SEARCH_FAKE_OBJ))))

+    if ((oc = av_opt_find(&cc, opt_stripped, NULL, 0,

+                         AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ)) ||

+        ((opt[0] == 'v' || opt[0] == 'a' || opt[0] == 's') &&

+         (oc = av_opt_find(&cc, opt + 1, NULL, 0, AV_OPT_SEARCH_FAKE_OBJ))))

         av_dict_set(&codec_opts, opt, arg, FLAGS(oc));

-    if ((of = av_opt_find(&fc, opt, NULL, 0, AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ)))

+    if ((of = av_opt_find(&fc, opt, NULL, 0,

+                          AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ)))

         av_dict_set(&format_opts, opt, arg, FLAGS(of));

 #if CONFIG_SWSCALE

     sc = sws_get_class();

-    if ((os = av_opt_find(&sc, opt, NULL, 0, AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ))) {

+    if ((os = av_opt_find(&sc, opt, NULL, 0,

+                          AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ))) {

         // XXX we only support sws_flags, not arbitrary sws options

         int ret = av_opt_set(sws_opts, opt, arg, 0);

         if (ret < 0) {

@@ -604,7 +615,8 @@ void show_banner(int argc, char **argv, const OptionDef *options)

     if (idx)

         return;

-    av_log(NULL, AV_LOG_INFO, "%s version " FFMPEG_VERSION ", Copyright (c) %d-%d the FFmpeg developers\n",

+    av_log(NULL, AV_LOG_INFO,

+           "%s version " FFMPEG_VERSION ", Copyright (c) %d-%d the FFmpeg developers\n",

            program_name, program_birth_year, this_year);

     av_log(NULL, AV_LOG_INFO, "  built on %s %s with %s %s\n",

            __DATE__, __TIME__, CC_TYPE, CC_VERSION);

@@ -692,49 +704,47 @@ int opt_license(const char *opt, const char *arg)

 int opt_formats(const char *opt, const char *arg)

 {

-    AVInputFormat *ifmt=NULL;

-    AVOutputFormat *ofmt=NULL;

+    AVInputFormat *ifmt  = NULL;

+    AVOutputFormat *ofmt = NULL;

     const char *last_name;

-    printf(

-        "File formats:\n"

-        " D. = Demuxing supported\n"

-        " .E = Muxing supported\n"

-        " --\n");

-    last_name= "000";

-    for(;;){

-        int decode=0;

-        int encode=0;

-        const char *name=NULL;

-        const char *long_name=NULL;

-

-        while((ofmt= av_oformat_next(ofmt))) {

-            if((name == NULL || strcmp(ofmt->name, name)<0) &&

-                strcmp(ofmt->name, last_name)>0){

-                name= ofmt->name;

-                long_name= ofmt->long_name;

-                encode=1;

+    printf("File formats:\n"

+           " D. = Demuxing supported\n"

+           " .E = Muxing supported\n"

+           " --\n");

+    last_name = "000";

+    for (;;) {

+        int decode = 0;

+        int encode = 0;

+        const char *name      = NULL;

+        const char *long_name = NULL;

+

+        while ((ofmt = av_oformat_next(ofmt))) {

+            if ((name == NULL || strcmp(ofmt->name, name) < 0) &&

+                strcmp(ofmt->name, last_name) > 0) {

+                name      = ofmt->name;

+                long_name = ofmt->long_name;

+                encode    = 1;

             }

         }

-        while((ifmt= av_iformat_next(ifmt))) {

-            if((name == NULL || strcmp(ifmt->name, name)<0) &&

-                strcmp(ifmt->name, last_name)>0){

-                name= ifmt->name;

-                long_name= ifmt->long_name;

-                encode=0;

+        while ((ifmt = av_iformat_next(ifmt))) {

+            if ((name == NULL || strcmp(ifmt->name, name) < 0) &&

+                strcmp(ifmt->name, last_name) > 0) {

+                name      = ifmt->name;

+                long_name = ifmt->long_name;

+                encode    = 0;

             }

-            if(name && strcmp(ifmt->name, name)==0)

-                decode=1;

+            if (name && strcmp(ifmt->name, name) == 0)

+                decode = 1;

         }

-        if(name==NULL)

+        if (name == NULL)

             break;

-        last_name= name;

+        last_name = name;

-        printf(

-            " %s%s %-15s %s\n",

-            decode ? "D":" ",

-            encode ? "E":" ",

-            name,

+        printf(" %s%s %-15s %s\n",

+               decode ? "D" : " ",

+               encode ? "E" : " ",

+               name,

             long_name ? long_name:" ");

     }

     return 0;

@@ -742,44 +752,45 @@ int opt_formats(const char *opt, const char *arg)

 int opt_codecs(const char *opt, const char *arg)

 {

-    AVCodec *p=NULL, *p2;

+    AVCodec *p = NULL, *p2;

     const char *last_name;

-    printf(

-        "Codecs:\n"

-        " D..... = Decoding supported\n"

-        " .E.... = Encoding supported\n"

-        " ..V... = Video codec\n"

-        " ..A... = Audio codec\n"

-        " ..S... = Subtitle codec\n"

-        " ...S.. = Supports draw_horiz_band\n"

-        " ....D. = Supports direct rendering method 1\n"

-        " .....T = Supports weird frame truncation\n"

-        " ------\n");

+    printf("Codecs:\n"

+           " D..... = Decoding supported\n"

+           " .E.... = Encoding supported\n"

+           " ..V... = Video codec\n"

+           " ..A... = Audio codec\n"

+           " ..S... = Subtitle codec\n"

+           " ...S.. = Supports draw_horiz_band\n"

+           " ....D. = Supports direct rendering method 1\n"

+           " .....T = Supports weird frame truncation\n"

+           " ------\n");

     last_name= "000";

-    for(;;){

-        int decode=0;

-        int encode=0;

-        int cap=0;

+    for (;;) {

+        int decode = 0;

+        int encode = 0;

+        int cap    = 0;

         const char *type_str;

-        p2=NULL;

-        while((p= av_codec_next(p))) {

-            if((p2==NULL || strcmp(p->name, p2->name)<0) &&

-                strcmp(p->name, last_name)>0){

-                p2= p;

-                decode= encode= cap=0;

+        p2 = NULL;

+        while ((p = av_codec_next(p))) {

+            if ((p2 == NULL || strcmp(p->name, p2->name) < 0) &&

+                strcmp(p->name, last_name) > 0) {

+                p2 = p;

+                decode = encode = cap = 0;

             }

-            if(p2 && strcmp(p->name, p2->name)==0){

-                if(p->decode) decode=1;

-                if(p->encode) encode=1;

+            if (p2 && strcmp(p->name, p2->name) == 0) {

+                if (p->decode)

+                    decode = 1;

+                if (p->encode)

+                    encode = 1;

                 cap |= p->capabilities;

             }

         }

-        if(p2==NULL)

+        if (p2 == NULL)

             break;

-        last_name= p2->name;

+        last_name = p2->name;

-        switch(p2->type) {

+        switch (p2->type) {

         case AVMEDIA_TYPE_VIDEO:

             type_str = "V";

             break;

@@ -793,36 +804,36 @@ int opt_codecs(const char *opt, const char *arg)

             type_str = "?";

             break;

         }

-        printf(

-            " %s%s%s%s%s%s %-15s %s",

-            decode ? "D": (/*p2->decoder ? "d":*/" "),

-            encode ? "E":" ",

-            type_str,

-            cap & CODEC_CAP_DRAW_HORIZ_BAND ? "S":" ",

-            cap & CODEC_CAP_DR1 ? "D":" ",

-            cap & CODEC_CAP_TRUNCATED ? "T":" ",

-            p2->name,

-            p2->long_name ? p2->long_name : "");

-       /* if(p2->decoder && decode==0)

-            printf(" use %s for decoding", p2->decoder->name);*/

+        printf(" %s%s%s%s%s%s %-15s %s",

+               decode ? "D" : (/* p2->decoder ? "d" : */ " "),

+               encode ? "E" : " ",

+               type_str,

+               cap & CODEC_CAP_DRAW_HORIZ_BAND ? "S" : " ",

+               cap & CODEC_CAP_DR1 ? "D" : " ",

+               cap & CODEC_CAP_TRUNCATED ? "T" : " ",

+               p2->name,

+               p2->long_name ? p2->long_name : "");

+#if 0

+            if (p2->decoder && decode == 0)

+                printf(" use %s for decoding", p2->decoder->name);

+#endif

         printf("\n");

     }

     printf("\n");

-    printf(

-"Note, the names of encoders and decoders do not always match, so there are\n"

-"several cases where the above table shows encoder only or decoder only entries\n"

-"even though both encoding and decoding are supported. For example, the h263\n"

-"decoder corresponds to the h263 and h263p encoders, for file formats it is even\n"

-"worse.\n");

+    printf("Note, the names of encoders and decoders do not always match, so there are\n"

+           "several cases where the above table shows encoder only or decoder only entries\n"

+           "even though both encoding and decoding are supported. For example, the h263\n"

+           "decoder corresponds to the h263 and h263p encoders, for file formats it is even\n"

+           "worse.\n");

     return 0;

 }

 int opt_bsfs(const char *opt, const char *arg)

 {

-    AVBitStreamFilter *bsf=NULL;

+    AVBitStreamFilter *bsf = NULL;

     printf("Bitstream filters:\n");

-    while((bsf = av_bitstream_filter_next(bsf)))

+    while ((bsf = av_bitstream_filter_next(bsf)))

         printf("%s\n", bsf->name);

     printf("\n");

     return 0;

@@ -863,15 +874,14 @@ int opt_pix_fmts(const char *opt, const char *arg)

 {

     enum PixelFormat pix_fmt;

-    printf(

-        "Pixel formats:\n"

-        "I.... = Supported Input  format for conversion\n"

-        ".O... = Supported Output format for conversion\n"

-        "..H.. = Hardware accelerated format\n"

-        "...P. = Paletted format\n"

-        "....B = Bitstream format\n"

-        "FLAGS NAME            NB_COMPONENTS BITS_PER_PIXEL\n"

-        "-----\n");

+    printf("Pixel formats:\n"

+           "I.... = Supported Input  format for conversion\n"

+           ".O... = Supported Output format for conversion\n"

+           "..H.. = Hardware accelerated format\n"

+           "...P. = Paletted format\n"

+           "....B = Bitstream format\n"

+           "FLAGS NAME            NB_COMPONENTS BITS_PER_PIXEL\n"

+           "-----\n");

 #if !CONFIG_SWSCALE

 #   define sws_isSupportedInput(x)  0

@@ -921,7 +931,8 @@ int cmdutils_read_file(const char *filename, char **bufptr, size_t *size)

     FILE *f = fopen(filename, "rb");

     if (!f) {

-        av_log(NULL, AV_LOG_ERROR, "Cannot read file '%s': %s\n", filename, strerror(errno));

+        av_log(NULL, AV_LOG_ERROR, "Cannot read file '%s': %s\n", filename,

+               strerror(errno));

         return AVERROR(errno);

     }

     fseek(f, 0, SEEK_END);

@@ -952,14 +963,14 @@ int cmdutils_read_file(const char *filename, char **bufptr, size_t *size)

 }

 FILE *get_preset_file(char *filename, size_t filename_size,

-                      const char *preset_name, int is_path, const char *codec_name)

+                      const char *preset_name, int is_path,

+                      const char *codec_name)

 {

     FILE *f = NULL;

     int i;

-    const char *base[3]= { getenv("FFMPEG_DATADIR"),

-                           getenv("HOME"),

-                           FFMPEG_DATADIR,

-                         };

+    const char *base[3] = { getenv("FFMPEG_DATADIR"),

+                            getenv("HOME"),

+                            FFMPEG_DATADIR, };

     if (is_path) {

         av_strlcpy(filename, preset_name, filename_size);

@@ -985,11 +996,14 @@ FILE *get_preset_file(char *filename, size_t filename_size,

         for (i = 0; i < 3 && !f; i++) {

             if (!base[i])

                 continue;

-            snprintf(filename, filename_size, "%s%s/%s.ffpreset", base[i], i != 1 ? "" : "/.ffmpeg", preset_name);

+            snprintf(filename, filename_size, "%s%s/%s.ffpreset", base[i],

+                     i != 1 ? "" : "/.ffmpeg", preset_name);

             f = fopen(filename, "r");

             if (!f && codec_name) {

                 snprintf(filename, filename_size,

-                         "%s%s/%s-%s.ffpreset", base[i],  i != 1 ? "" : "/.ffmpeg", codec_name, preset_name);

+                         "%s%s/%s-%s.ffpreset",

+                         base[i],  i != 1 ? "" : "/.ffmpeg", codec_name,

+                         preset_name);

                 f = fopen(filename, "r");

             }

         }

@@ -1000,22 +1014,23 @@ FILE *get_preset_file(char *filename, size_t filename_size,

 int check_stream_specifier(AVFormatContext *s, AVStream *st, const char *spec)

 {

-    if (*spec <= '9' && *spec >= '0')                                        /* opt:index */

+    if (*spec <= '9' && *spec >= '0') /* opt:index */

         return strtol(spec, NULL, 0) == st->index;

-    else if (*spec == 'v' || *spec == 'a' || *spec == 's' || *spec == 'd' || *spec == 't') { /* opt:[vasdt] */

+    else if (*spec == 'v' || *spec == 'a' || *spec == 's' || *spec == 'd' ||

+             *spec == 't') { /* opt:[vasdt] */

         enum AVMediaType type;

         switch (*spec++) {

-        case 'v': type = AVMEDIA_TYPE_VIDEO;    break;

-        case 'a': type = AVMEDIA_TYPE_AUDIO;    break;

-        case 's': type = AVMEDIA_TYPE_SUBTITLE; break;

-        case 'd': type = AVMEDIA_TYPE_DATA;     break;

+        case 'v': type = AVMEDIA_TYPE_VIDEO;      break;

+        case 'a': type = AVMEDIA_TYPE_AUDIO;      break;

+        case 's': type = AVMEDIA_TYPE_SUBTITLE;   break;

+        case 'd': type = AVMEDIA_TYPE_DATA;       break;

         case 't': type = AVMEDIA_TYPE_ATTACHMENT; break;

         default: abort(); // never reached, silence warning

         }

         if (type != st->codec->codec_type)

             return 0;

-        if (*spec++ == ':') {                                   /* possibly followed by :index */

+        if (*spec++ == ':') { /* possibly followed by :index */

             int i, index = strtol(spec, NULL, 0);

             for (i = 0; i < s->nb_streams; i++)

                 if (s->streams[i]->codec->codec_type == type && index-- == 0)

@@ -1051,11 +1066,13 @@ int check_stream_specifier(AVFormatContext *s, AVStream *st, const char *spec)

     return AVERROR(EINVAL);

 }

-AVDictionary *filter_codec_opts(AVDictionary *opts, AVCodec *codec, AVFormatContext *s, AVStream *st)

+AVDictionary *filter_codec_opts(AVDictionary *opts, AVCodec *codec,

+                                AVFormatContext *s, AVStream *st)

 {

     AVDictionary    *ret = NULL;

     AVDictionaryEntry *t = NULL;

-    int            flags = s->oformat ? AV_OPT_FLAG_ENCODING_PARAM : AV_OPT_FLAG_DECODING_PARAM;

+    int            flags = s->oformat ? AV_OPT_FLAG_ENCODING_PARAM

+                                      : AV_OPT_FLAG_DECODING_PARAM;

     char          prefix = 0;

     const AVClass    *cc = avcodec_get_class();

@@ -1063,9 +1080,18 @@ AVDictionary *filter_codec_opts(AVDictionary *opts, AVCodec *codec, AVFormatCont

         return NULL;

     switch (codec->type) {

-    case AVMEDIA_TYPE_VIDEO:    prefix = 'v'; flags |= AV_OPT_FLAG_VIDEO_PARAM;    break;

-    case AVMEDIA_TYPE_AUDIO:    prefix = 'a'; flags |= AV_OPT_FLAG_AUDIO_PARAM;    break;

-    case AVMEDIA_TYPE_SUBTITLE: prefix = 's'; flags |= AV_OPT_FLAG_SUBTITLE_PARAM; break;

+    case AVMEDIA_TYPE_VIDEO:

+        prefix  = 'v';

+        flags  |= AV_OPT_FLAG_VIDEO_PARAM;

+        break;

+    case AVMEDIA_TYPE_AUDIO:

+        prefix  = 'a';

+        flags  |= AV_OPT_FLAG_AUDIO_PARAM;

+        break;

+    case AVMEDIA_TYPE_SUBTITLE:

+        prefix  = 's';

+        flags  |= AV_OPT_FLAG_SUBTITLE_PARAM;

+        break;

     }

     while (t = av_dict_get(opts, "", t, AV_DICT_IGNORE_SUFFIX)) {

@@ -1080,10 +1106,14 @@ AVDictionary *filter_codec_opts(AVDictionary *opts, AVCodec *codec, AVFormatCont

             }

         if (av_opt_find(&cc, t->key, NULL, flags, AV_OPT_SEARCH_FAKE_OBJ) ||

-            (codec && codec->priv_class && av_opt_find(&codec->priv_class, t->key, NULL, flags, AV_OPT_SEARCH_FAKE_OBJ)))

+            (codec && codec->priv_class &&

+             av_opt_find(&codec->priv_class, t->key, NULL, flags,

+                         AV_OPT_SEARCH_FAKE_OBJ)))

             av_dict_set(&ret, t->key, t->value, 0);

-        else if (t->key[0] == prefix && av_opt_find(&cc, t->key+1, NULL, flags, AV_OPT_SEARCH_FAKE_OBJ))

-            av_dict_set(&ret, t->key+1, t->value, 0);

+        else if (t->key[0] == prefix &&

+                 av_opt_find(&cc, t->key + 1, NULL, flags,

+                             AV_OPT_SEARCH_FAKE_OBJ))

+            av_dict_set(&ret, t->key + 1, t->value, 0);

         if (p)

             *p = ':';

@@ -1091,7 +1121,8 @@ AVDictionary *filter_codec_opts(AVDictionary *opts, AVCodec *codec, AVFormatCont

     return ret;

 }

-AVDictionary **setup_find_stream_info_opts(AVFormatContext *s, AVDictionary *codec_opts)

+AVDictionary **setup_find_stream_info_opts(AVFormatContext *s,

+                                           AVDictionary *codec_opts)

 {

     int i;

     AVDictionary **opts;

@@ -1100,11 +1131,13 @@ AVDictionary **setup_find_stream_info_opts(AVFormatContext *s, AVDictionary *cod

         return NULL;

     opts = av_mallocz(s->nb_streams * sizeof(*opts));

     if (!opts) {

-        av_log(NULL, AV_LOG_ERROR, "Could not alloc memory for stream options.\n");

+        av_log(NULL, AV_LOG_ERROR,

+               "Could not alloc memory for stream options.\n");

         return NULL;

     }

     for (i = 0; i < s->nb_streams; i++)

-        opts[i] = filter_codec_opts(codec_opts, avcodec_find_decoder(s->streams[i]->codec->codec_id), s, s->streams[i]);

+        opts[i] = filter_codec_opts(codec_opts, avcodec_find_decoder(s->streams[i]->codec->codec_id),

+                                    s, s->streams[i]);

     return opts;

 }

@@ -1175,9 +1175,9 @@ HAVE_LIST="

     fork

     getaddrinfo

     gethrtime

+    GetProcessAffinityMask

     GetProcessMemoryInfo

     GetProcessTimes

-    GetSystemInfo

     getrusage

     gnu_as

     ibm_asm

@@ -3016,8 +3016,8 @@ check_func_headers windows.h PeekNamedPipe

 check_func_headers io.h setmode

 check_func_headers lzo/lzo1x.h lzo1x_999_compress

 check_lib2 "windows.h psapi.h" GetProcessMemoryInfo -lpsapi

+check_func_headers windows.h GetProcessAffinityMask

 check_func_headers windows.h GetProcessTimes

-check_func_headers windows.h GetSystemInfo

 check_func_headers windows.h MapViewOfFile

 check_func_headers windows.h VirtualAlloc

@@ -31,21 +31,24 @@ API changes, most recent first:

 2011-10-20 - b35e9e1 - lavu 51.22.0

   Add av_strtok() to avstring.h.

+2011-01-03 - b73ec05 - lavu 51.21.0

+  Add av_popcount64

+

 2011-12-18 - 8400b12 - lavc 53.28.1

   Deprecate AVFrame.age. The field is unused.

-2011-xx-xx - xxxxxxx - lavf 53.17.0

-  Add avformat_open_input().

+2011-12-12 - 5266045 - lavf 53.17.0

+  Add avformat_close_input().

   Deprecate av_close_input_file() and av_close_input_stream().

-2011-xx-xx - xxxxxxx - lavc 53.25.0

+2011-12-02 - 0eea212 - lavc 53.25.0

   Add nb_samples and extended_data fields to AVFrame.

   Deprecate AVCODEC_MAX_AUDIO_FRAME_SIZE.

   Deprecate avcodec_decode_audio3() in favor of avcodec_decode_audio4().

   avcodec_decode_audio4() writes output samples to an AVFrame, which allows

   audio decoders to use get_buffer().

-2011-xx-xx - xxxxxxx - lavc 53.24.0

+2011-12-04 - 560f773 - lavc 53.24.0

   Change AVFrame.data[4]/base[4]/linesize[4]/error[4] to [8] at next major bump.

   Change AVPicture.data[4]/linesize[4] to [8] at next major bump.

   Change AVCodecContext.error[4] to [8] at next major bump.

@@ -58,7 +58,7 @@ int avpriv_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf,

     /* channels */

     avctx->channels = buf[7];

-    if (avctx->channels > 2)

+    if (avctx->channels <= 0 || avctx->channels > 2)

         return AVERROR_INVALIDDATA;

     /* sample rate */

@@ -45,27 +45,31 @@ static int adx_parse(AVCodecParserContext *s1,

     ParseContext *pc = &s->pc;

     int next = END_NOT_FOUND;

     int i;

-    uint64_t state= pc->state64;

+    uint64_t state = pc->state64;

-    if(!s->header_size){

-        for(i=0; i<buf_size; i++){

-            state= (state<<8) | buf[i];

-            if((state&0xFFFF0000FFFFFF00) == 0x8000000003120400ULL && (state&0xFF) && ((state>>32)&0xFFFF)>=4){

-                s->header_size= ((state>>32)&0xFFFF) + 4;

-                s->block_size = BLOCK_SIZE * (state&0xFF);

-                s->remaining  = i - 7 + s->header_size + s->block_size;

-                break;

+    if (!s->header_size) {

+        for (i = 0; i < buf_size; i++) {

+            state = (state << 8) | buf[i];

+            /* check for fixed fields in ADX header for possible match */

+            if ((state & 0xFFFF0000FFFFFF00) == 0x8000000003120400ULL) {

+                int channels    = state & 0xFF;

+                int header_size = ((state >> 32) & 0xFFFF) + 4;

+                if (channels > 0 && header_size >= 8) {

+                    s->header_size = header_size;

+                    s->block_size  = BLOCK_SIZE * channels;

+                    s->remaining   = i - 7 + s->header_size + s->block_size;

+                    break;

+                }

             }

         }

-        pc->state64= state;

+        pc->state64 = state;

     }

     if (s->header_size) {

-        if (!s->remaining) {

+        if (!s->remaining)

             s->remaining = s->block_size;

-        }

-        if (s->remaining<=buf_size) {

-            next= s->remaining;

+        if (s->remaining <= buf_size) {

+            next = s->remaining;

             s->remaining = 0;

         } else

             s->remaining -= buf_size;

@@ -45,7 +45,8 @@ static av_cold int adx_decode_init(AVCodecContext *avctx)

             av_log(avctx, AV_LOG_ERROR, "error parsing ADX header\n");

             return AVERROR_INVALIDDATA;

         }

-        c->channels = avctx->channels;

+        c->channels      = avctx->channels;

+        c->header_parsed = 1;

     }

     avctx->sample_fmt = AV_SAMPLE_FMT_S16;

@@ -106,21 +107,21 @@ static int adx_decode_frame(AVCodecContext *avctx, void *data,

         return buf_size;

     }

-    if(AV_RB16(buf) == 0x8000){

+    if (!c->header_parsed && buf_size >= 2 && AV_RB16(buf) == 0x8000) {

         int header_size;

-        if ((ret = avpriv_adx_decode_header(avctx, buf,

-                                            buf_size, &header_size,

+        if ((ret = avpriv_adx_decode_header(avctx, buf, buf_size, &header_size,

                                             c->coeff)) < 0) {

             av_log(avctx, AV_LOG_ERROR, "error parsing ADX header\n");

             return AVERROR_INVALIDDATA;

         }

-        c->channels = avctx->channels;

-        if(buf_size < header_size)

+        c->channels      = avctx->channels;

+        c->header_parsed = 1;

+        if (buf_size < header_size)

             return AVERROR_INVALIDDATA;

-        buf += header_size;

+        buf      += header_size;

         buf_size -= header_size;

     }

-    if(c->channels <= 0)

+    if (!c->header_parsed)

         return AVERROR_INVALIDDATA;

     /* calculate number of blocks in the packet */

@@ -25,27 +25,23 @@

  * @author 2005 David Hammerton

  * @see http://crazney.net/programs/itunes/alac.html

  *

- * Note: This decoder expects a 36- (0x24-)byte QuickTime atom to be

+ * Note: This decoder expects a 36-byte QuickTime atom to be

  * passed through the extradata[_size] fields. This atom is tacked onto

  * the end of an 'alac' stsd atom and has the following format:

- *  bytes 0-3   atom size (0x24), big-endian

- *  bytes 4-7   atom type ('alac', not the 'alac' tag from start of stsd)

- *  bytes 8-35  data bytes needed by decoder

  *

- * Extradata:

- * 32bit  size

- * 32bit  tag (=alac)

- * 32bit  zero?

- * 32bit  max sample per frame

- *  8bit  ?? (zero?)

+ * 32bit  atom size

+ * 32bit  tag                  ("alac")

+ * 32bit  tag version          (0)

+ * 32bit  samples per frame    (used when not set explicitly in the frames)

+ *  8bit  compatible version   (0)

  *  8bit  sample size

- *  8bit  history mult

- *  8bit  initial history

- *  8bit  kmodifier

- *  8bit  channels?

- * 16bit  ??

- * 32bit  max coded frame size

- * 32bit  bitrate?

+ *  8bit  history mult         (40)

+ *  8bit  initial history      (14)

+ *  8bit  kmodifier            (10)

+ *  8bit  channels

+ * 16bit  maxRun               (255)

+ * 32bit  max coded frame size (0 means unknown)

+ * 32bit  average bitrate      (0 means unknown)

  * 32bit  samplerate

  */

@@ -464,24 +460,29 @@ static int alac_decode_frame(AVCodecContext *avctx, void *data,

             if(ret<0)

                 return ret;

-            if (prediction_type[ch] == 0) {

-                /* adaptive fir */

-                predictor_decompress_fir_adapt(alac->predicterror_buffer[ch],

-                                               alac->outputsamples_buffer[ch],

-                                               outputsamples,

-                                               readsamplesize,

-                                               predictor_coef_table[ch],

-                                               predictor_coef_num[ch],

-                                               prediction_quantitization[ch]);

-            } else {

-                av_log(avctx, AV_LOG_ERROR, "FIXME: unhandled prediction type: %i\n", prediction_type[ch]);

-                /* I think the only other prediction type (or perhaps this is

-                 * just a boolean?) runs adaptive fir twice.. like:

-                 * predictor_decompress_fir_adapt(predictor_error, tempout, ...)

-                 * predictor_decompress_fir_adapt(predictor_error, outputsamples ...)

-                 * little strange..

+            /* adaptive FIR filter */

+            if (prediction_type[ch] == 15) {

+                /* Prediction type 15 runs the adaptive FIR twice.

+                 * The first pass uses the special-case coef_num = 31, while

+                 * the second pass uses the coefs from the bitstream.

+                 *

+                 * However, this prediction type is not currently used by the

+                 * reference encoder.

                  */

+                predictor_decompress_fir_adapt(alac->predicterror_buffer[ch],

+                                               alac->predicterror_buffer[ch],

+                                               outputsamples, readsamplesize,

+                                               NULL, 31, 0);

+            } else if (prediction_type[ch] > 0) {

+                av_log(avctx, AV_LOG_WARNING, "unknown prediction type: %i\n",

+                       prediction_type[ch]);

             }

+            predictor_decompress_fir_adapt(alac->predicterror_buffer[ch],

+                                           alac->outputsamples_buffer[ch],

+                                           outputsamples, readsamplesize,

+                                           predictor_coef_table[ch],

+                                           predictor_coef_num[ch],

+                                           prediction_quantitization[ch]);

         }

     } else {

         /* not compressed, easy case */

@@ -584,7 +585,7 @@ static int alac_set_info(ALACContext *alac)

     ptr += 4; /* size */

     ptr += 4; /* alac */

-    ptr += 4; /* 0 ? */

+    ptr += 4; /* version */

     if(AV_RB32(ptr) >= UINT_MAX/4){

         av_log(alac->avctx, AV_LOG_ERROR, "setinfo_max_samples_per_frame too large\n");

@@ -593,15 +594,15 @@ static int alac_set_info(ALACContext *alac)

     /* buffer size / 2 ? */

     alac->setinfo_max_samples_per_frame = bytestream_get_be32(&ptr);

-    ptr++;                          /* ??? */

+    ptr++;                          /* compatible version */

     alac->setinfo_sample_size           = *ptr++;

     alac->setinfo_rice_historymult      = *ptr++;

     alac->setinfo_rice_initialhistory   = *ptr++;

     alac->setinfo_rice_kmodifier        = *ptr++;

     alac->numchannels                   = *ptr++;

-    bytestream_get_be16(&ptr);      /* ??? */

+    bytestream_get_be16(&ptr);      /* maxRun */

     bytestream_get_be32(&ptr);      /* max coded frame size */

-    bytestream_get_be32(&ptr);      /* bitrate ? */

+    bytestream_get_be32(&ptr);      /* average bitrate */

     bytestream_get_be32(&ptr);      /* samplerate */

     return 0;

@@ -348,6 +348,7 @@ static void alac_entropy_coder(AlacEncodeContext *s)

 static void write_compressed_frame(AlacEncodeContext *s)

 {

     int i, j;

+    int prediction_type = 0;

     if (s->avctx->channels == 2)

         alac_stereo_decorrelation(s);

@@ -358,7 +359,7 @@ static void write_compressed_frame(AlacEncodeContext *s)

         calc_predictor_params(s, i);