@@ -26,6 +26,9 @@ API changes, most recent first:

 2011-05-XX - XXXXXX - lavfi 2.6.0 - avcodec.h

   Add avfilter_get_video_buffer_ref_from_frame() to libavfilter/avcodec.h.

+2011-05-25 - 30315a8 - lavf 53.1.0 - avformat.h

+  Add fps_probe_size to AVFormatContext.

+

 2011-05-18 - 64150ff - lavc 53.4.0 - AVCodecContext.request_sample_fmt

   Add request_sample_fmt field to AVCodecContext.

@@ -477,5 +477,4 @@ Selected by Encoder (default)

 @end table

-@c man end ENCODERS

-

+@c man end AUDIO ENCODERS

@@ -114,11 +114,9 @@ static const OptionDef options[];

 #define MAX_STREAMS 1024    /* arbitrary sanity check value */

 static const char *last_asked_format = NULL;

-static AVFormatContext *input_files[MAX_FILES];

 static int64_t input_files_ts_offset[MAX_FILES];

 static double *input_files_ts_scale[MAX_FILES] = {NULL};

 static AVCodec **input_codecs = NULL;

-static int nb_input_files = 0;

 static int nb_input_codecs = 0;

 static int nb_input_files_ts_scale[MAX_FILES] = {0};

@@ -319,7 +317,6 @@ static int nb_output_streams_for_file[MAX_FILES] = { 0 };

 typedef struct AVInputStream {

     int file_index;

-    int index;

     AVStream *st;

     int discard;             /* true if stream data should be discarded */

     int decoding_needed;     /* true if the packets must be decoded in 'raw_fifo' */

@@ -339,10 +336,10 @@ typedef struct AVInputStream {

 } AVInputStream;

 typedef struct AVInputFile {

+    AVFormatContext *ctx;

     int eof_reached;      /* true if eof reached */

     int ist_index;        /* index of first stream in ist_table */

     int buffer_size;      /* current total buffer size */

-    int nb_streams;       /* nb streams we are aware of */

 } AVInputFile;

 #if HAVE_TERMIOS_H

@@ -351,6 +348,11 @@ typedef struct AVInputFile {

 static struct termios oldtty;

 #endif

+static AVInputStream *input_streams = NULL;

+static int         nb_input_streams = 0;

+static AVInputFile   *input_files   = NULL;

+static int         nb_input_files   = 0;

+

 #if CONFIG_AVFILTER

 static int configure_video_filters(AVInputStream *ist, AVOutputStream *ost)

@@ -537,7 +539,7 @@ static int ffmpeg_exit(int ret)

         av_free(output_streams_for_file[i]);

     }

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

-        av_close_input_file(input_files[i]);

+        av_close_input_file(input_files[i].ctx);

         av_free(input_files_ts_scale[i]);

     }

@@ -554,6 +556,9 @@ static int ffmpeg_exit(int ret)

     av_free(stream_maps);

     av_free(meta_data_maps);

+    av_freep(&input_streams);

+    av_freep(&input_files);

+

     av_free(video_codec_name);

     av_free(audio_codec_name);

     av_free(subtitle_codec_name);

@@ -839,7 +844,7 @@ need_realloc:

     if ((ost->audio_resample && !ost->resample) || resample_changed) {

         if (resample_changed) {

             av_log(NULL, AV_LOG_INFO, "Input stream #%d.%d frame changed from rate:%d fmt:%s ch:%d to rate:%d fmt:%s ch:%d\n",

-                   ist->file_index, ist->index,

+                   ist->file_index, ist->st->index,

                    ost->resample_sample_rate, av_get_sample_fmt_name(ost->resample_sample_fmt), ost->resample_channels,

                    dec->sample_rate, av_get_sample_fmt_name(dec->sample_fmt), dec->channels);

             ost->resample_sample_fmt  = dec->sample_fmt;

@@ -1202,7 +1207,7 @@ static void do_video_out(AVFormatContext *s,

     if (resample_changed) {

         av_log(NULL, AV_LOG_INFO,

                "Input stream #%d.%d frame changed from size:%dx%d fmt:%s to size:%dx%d fmt:%s\n",

-               ist->file_index, ist->index,

+               ist->file_index, ist->st->index,

                ost->resample_width, ost->resample_height, avcodec_get_pix_fmt_name(ost->resample_pix_fmt),

                dec->width         , dec->height         , avcodec_get_pix_fmt_name(dec->pix_fmt));

         ost->resample_width   = dec->width;

@@ -1903,7 +1908,7 @@ static void print_sdp(AVFormatContext **avc, int n)

 static int copy_chapters(int infile, int outfile)

 {

-    AVFormatContext *is = input_files[infile];

+    AVFormatContext *is = input_files[infile].ctx;

     AVFormatContext *os = output_files[outfile];

     int i;

@@ -1969,16 +1974,16 @@ static void parse_forced_key_frames(char *kf, AVOutputStream *ost,

  */

 static int transcode(AVFormatContext **output_files,

                      int nb_output_files,

-                     AVFormatContext **input_files,

+                     AVInputFile *input_files,

                      int nb_input_files,

                      AVStreamMap *stream_maps, int nb_stream_maps)

 {

-    int ret = 0, i, j, k, n, nb_istreams = 0, nb_ostreams = 0, step;

+    int ret = 0, i, j, k, n, nb_istreams = 0, nb_ostreams = 0,step;

+

     AVFormatContext *is, *os;

     AVCodecContext *codec, *icodec;

     AVOutputStream *ost, **ost_table = NULL;

-    AVInputStream *ist, **ist_table = NULL;

-    AVInputFile *file_table;

+    AVInputStream *ist;

     char error[1024];

     int key;

     int want_sdp = 1;

@@ -1987,46 +1992,9 @@ static int transcode(AVFormatContext **output_files,

     int nb_frame_threshold[AVMEDIA_TYPE_NB]={0};

     int nb_streams[AVMEDIA_TYPE_NB]={0};

-    file_table= av_mallocz(nb_input_files * sizeof(AVInputFile));

-    if (!file_table)

-        goto fail;

-

-    /* input stream init */

-    j = 0;

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

-        is = input_files[i];

-        file_table[i].ist_index = j;

-        file_table[i].nb_streams = is->nb_streams;

-        j += is->nb_streams;

-    }

-    nb_istreams = j;

-

-    ist_table = av_mallocz(nb_istreams * sizeof(AVInputStream *));

-    if (!ist_table)

-        goto fail;

-

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

-        ist = av_mallocz(sizeof(AVInputStream));

-        if (!ist)

-            goto fail;

-        ist_table[i] = ist;

-    }

-    j = 0;

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

-        is = input_files[i];

-        for(k=0;k<is->nb_streams;k++) {

-            ist = ist_table[j++];

-            ist->st = is->streams[k];

-            ist->file_index = i;

-            ist->index = k;

-            ist->discard = 1; /* the stream is discarded by default

-                                 (changed later) */

-

-            if (rate_emu) {

-                ist->start = av_gettime();

-            }

-        }

-    }

+    if (rate_emu)

+        for (i = 0; i < nb_input_streams; i++)

+            input_streams[i].start = av_gettime();

     /* output stream init */

     nb_ostreams = 0;

@@ -2052,7 +2020,7 @@ static int transcode(AVFormatContext **output_files,

         int si = stream_maps[i].stream_index;

         if (fi < 0 || fi > nb_input_files - 1 ||

-            si < 0 || si > file_table[fi].nb_streams - 1) {

+            si < 0 || si > input_files[fi].ctx->nb_streams - 1) {

             fprintf(stderr,"Could not find input stream #%d.%d\n", fi, si);

             ret = AVERROR(EINVAL);

             goto fail;

@@ -2060,7 +2028,7 @@ static int transcode(AVFormatContext **output_files,

         fi = stream_maps[i].sync_file_index;

         si = stream_maps[i].sync_stream_index;

         if (fi < 0 || fi > nb_input_files - 1 ||

-            si < 0 || si > file_table[fi].nb_streams - 1) {

+            si < 0 || si > input_files[fi].ctx->nb_streams - 1) {

             fprintf(stderr,"Could not find sync stream #%d.%d\n", fi, si);

             ret = AVERROR(EINVAL);

             goto fail;

@@ -2082,12 +2050,12 @@ static int transcode(AVFormatContext **output_files,

         for(j=0; j<AVMEDIA_TYPE_NB; j++)

             nb_frame_threshold[j] += step;

-        for(j=0; j<nb_istreams; j++) {

+        for(j=0; j<nb_input_streams; j++) {

             int skip=0;

-            ist = ist_table[j];

+            ist = &input_streams[j];

             if(opt_programid){

                 int pi,si;

-                AVFormatContext *f= input_files[ ist->file_index ];

+                AVFormatContext *f= input_files[ ist->file_index ].ctx;

                 skip=1;

                 for(pi=0; pi<f->nb_programs; pi++){

                     AVProgram *p= f->programs[pi];

@@ -2115,11 +2083,11 @@ static int transcode(AVFormatContext **output_files,

             ost = ost_table[n] = output_streams_for_file[k][i];

             ost->st = os->streams[i];

             if (nb_stream_maps > 0) {

-                ost->source_index = file_table[stream_maps[n].file_index].ist_index +

+                ost->source_index = input_files[stream_maps[n].file_index].ist_index +

                     stream_maps[n].stream_index;

                 /* Sanity check that the stream types match */

-                if (ist_table[ost->source_index]->st->codec->codec_type != ost->st->codec->codec_type) {

+                if (input_streams[ost->source_index].st->codec->codec_type != ost->st->codec->codec_type) {

                     int i= ost->file_index;

                     av_dump_format(output_files[i], i, output_files[i]->filename, 1);

                     fprintf(stderr, "Codec type mismatch for mapping #%d.%d -> #%d.%d\n",

@@ -2131,12 +2099,12 @@ static int transcode(AVFormatContext **output_files,

             } else {

                 /* get corresponding input stream index : we select the first one with the right type */

                 found = 0;

-                for(j=0;j<nb_istreams;j++) {

+                for (j = 0; j < nb_input_streams; j++) {

                     int skip=0;

-                    ist = ist_table[j];

+                    ist = &input_streams[j];

                     if(opt_programid){

                         int pi,si;

-                        AVFormatContext *f= input_files[ ist->file_index ];

+                        AVFormatContext *f = input_files[ist->file_index].ctx;

                         skip=1;

                         for(pi=0; pi<f->nb_programs; pi++){

                             AVProgram *p= f->programs[pi];

@@ -2159,8 +2127,8 @@ static int transcode(AVFormatContext **output_files,

                 if (!found) {

                     if(! opt_programid) {

                         /* try again and reuse existing stream */

-                        for(j=0;j<nb_istreams;j++) {

-                            ist = ist_table[j];

+                        for (j = 0; j < nb_input_streams; j++) {

+                            ist = &input_streams[j];

                             if (   ist->st->codec->codec_type == ost->st->codec->codec_type

                                 && ist->st->discard != AVDISCARD_ALL) {

                                 ost->source_index = j;

@@ -2177,10 +2145,10 @@ static int transcode(AVFormatContext **output_files,

                     }

                 }

             }

-            ist = ist_table[ost->source_index];

+            ist = &input_streams[ost->source_index];

             ist->discard = 0;

             ost->sync_ist = (nb_stream_maps > 0) ?

-                ist_table[file_table[stream_maps[n].sync_file_index].ist_index +

+                &input_streams[input_files[stream_maps[n].sync_file_index].ist_index +

                          stream_maps[n].sync_stream_index] : ist;

         }

     }

@@ -2189,7 +2157,7 @@ static int transcode(AVFormatContext **output_files,

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

         ost = ost_table[i];

         os = output_files[ost->file_index];

-        ist = ist_table[ost->source_index];

+        ist = &input_streams[ost->source_index];

         codec = ost->st->codec;

         icodec = ist->st->codec;

@@ -2368,7 +2336,7 @@ static int transcode(AVFormatContext **output_files,

         ost = ost_table[i];

         if (ost->encoding_needed) {

             AVCodec *codec = i < nb_output_codecs ? output_codecs[i] : NULL;

-            AVCodecContext *dec = ist_table[ost->source_index]->st->codec;

+            AVCodecContext *dec = input_streams[ost->source_index].st->codec;

             if (!codec)

                 codec = avcodec_find_encoder(ost->st->codec->codec_id);

             if (!codec) {

@@ -2397,21 +2365,21 @@ static int transcode(AVFormatContext **output_files,

     }

     /* open each decoder */

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

-        ist = ist_table[i];

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

+        ist = &input_streams[i];

         if (ist->decoding_needed) {

             AVCodec *codec = i < nb_input_codecs ? input_codecs[i] : NULL;

             if (!codec)

                 codec = avcodec_find_decoder(ist->st->codec->codec_id);

             if (!codec) {

                 snprintf(error, sizeof(error), "Decoder (codec id %d) not found for input stream #%d.%d",

-                        ist->st->codec->codec_id, ist->file_index, ist->index);

+                        ist->st->codec->codec_id, ist->file_index, ist->st->index);

                 ret = AVERROR(EINVAL);

                 goto dump_format;

             }

             if (avcodec_open(ist->st->codec, codec) < 0) {

                 snprintf(error, sizeof(error), "Error while opening decoder for input stream #%d.%d",

-                        ist->file_index, ist->index);

+                        ist->file_index, ist->st->index);

                 ret = AVERROR(EINVAL);

                 goto dump_format;

             }

@@ -2421,9 +2389,9 @@ static int transcode(AVFormatContext **output_files,

     }

     /* init pts */

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

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

         AVStream *st;

-        ist = ist_table[i];

+        ist = &input_streams[i];

         st= ist->st;

         ist->pts = st->avg_frame_rate.num ? - st->codec->has_b_frames*AV_TIME_BASE / av_q2d(st->avg_frame_rate) : 0;

         ist->next_pts = AV_NOPTS_VALUE;

@@ -2452,7 +2420,7 @@ static int transcode(AVFormatContext **output_files,

         METADATA_CHECK_INDEX(in_file_index, nb_input_files, "input file")

         files[0] = output_files[out_file_index];

-        files[1] = input_files[in_file_index];

+        files[1] = input_files[in_file_index].ctx;

         for (j = 0; j < 2; j++) {

             AVMetaDataMap *map = &meta_data_maps[i][j];

@@ -2483,7 +2451,7 @@ static int transcode(AVFormatContext **output_files,

     if (metadata_global_autocopy) {

         for (i = 0; i < nb_output_files; i++)

-            av_metadata_copy(&output_files[i]->metadata, input_files[0]->metadata,

+            av_metadata_copy(&output_files[i]->metadata, input_files[0].ctx->metadata,

                              AV_METADATA_DONT_OVERWRITE);

     }

@@ -2510,7 +2478,7 @@ static int transcode(AVFormatContext **output_files,

     /* copy chapters from the first input file that has them*/

     if (!nb_chapter_maps)

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

-            if (!input_files[i]->nb_chapters)

+            if (!input_files[i].ctx->nb_chapters)

                 continue;

             for (j = 0; j < nb_output_files; j++)

@@ -2545,14 +2513,14 @@ static int transcode(AVFormatContext **output_files,

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

             ost = ost_table[i];

             fprintf(stderr, "  Stream #%d.%d -> #%d.%d",

-                    ist_table[ost->source_index]->file_index,

-                    ist_table[ost->source_index]->index,

+                    input_streams[ost->source_index].file_index,

+                    input_streams[ost->source_index].st->index,

                     ost->file_index,

                     ost->index);

-            if (ost->sync_ist != ist_table[ost->source_index])

+            if (ost->sync_ist != &input_streams[ost->source_index])

                 fprintf(stderr, " [sync #%d.%d]",

                         ost->sync_ist->file_index,

-                        ost->sync_ist->index);

+                        ost->sync_ist->st->index);

             fprintf(stderr, "\n");

         }

     }

@@ -2607,16 +2575,14 @@ static int transcode(AVFormatContext **output_files,

             if (key == 'd' || key == 'D'){

                 int debug=0;

                 if(key == 'D') {

-                    ist = ist_table[0];

-                    debug = ist->st->codec->debug<<1;

+                    debug = input_streams[0].st->codec->debug<<1;

                     if(!debug) debug = 1;

                     while(debug & (FF_DEBUG_DCT_COEFF|FF_DEBUG_VIS_QP|FF_DEBUG_VIS_MB_TYPE)) //unsupported, would just crash

                         debug += debug;

                 }else

                     scanf("%d", &debug);

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

-                    ist = ist_table[i];

-                    ist->st->codec->debug = debug;

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

+                    input_streams[i].st->codec->debug = debug;

                 }

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

                     ost = ost_table[i];

@@ -2645,12 +2611,12 @@ static int transcode(AVFormatContext **output_files,

             double ipts, opts;

             ost = ost_table[i];

             os = output_files[ost->file_index];

-            ist = ist_table[ost->source_index];

+            ist = &input_streams[ost->source_index];

             if(ist->is_past_recording_time || no_packet[ist->file_index])

                 continue;

                 opts = ost->st->pts.val * av_q2d(ost->st->time_base);

             ipts = (double)ist->pts;

-            if (!file_table[ist->file_index].eof_reached){

+            if (!input_files[ist->file_index].eof_reached){

                 if(ipts < ipts_min) {

                     ipts_min = ipts;

                     if(input_sync ) file_index = ist->file_index;

@@ -2681,7 +2647,7 @@ static int transcode(AVFormatContext **output_files,

             break;

         /* read a frame from it and output it in the fifo */

-        is = input_files[file_index];

+        is = input_files[file_index].ctx;

         ret= av_read_frame(is, &pkt);

         if(ret == AVERROR(EAGAIN)){

             no_packet[file_index]=1;

@@ -2689,7 +2655,7 @@ static int transcode(AVFormatContext **output_files,

             continue;

         }

         if (ret < 0) {

-            file_table[file_index].eof_reached = 1;

+            input_files[file_index].eof_reached = 1;

             if (opt_shortest)

                 break;

             else

@@ -2705,10 +2671,10 @@ static int transcode(AVFormatContext **output_files,

         }

         /* the following test is needed in case new streams appear

            dynamically in stream : we ignore them */

-        if (pkt.stream_index >= file_table[file_index].nb_streams)

+        if (pkt.stream_index >= input_files[file_index].ctx->nb_streams)

             goto discard_packet;

-        ist_index = file_table[file_index].ist_index + pkt.stream_index;

-        ist = ist_table[ist_index];

+        ist_index = input_files[file_index].ist_index + pkt.stream_index;

+        ist = &input_streams[ist_index];

         if (ist->discard)

             goto discard_packet;

@@ -2751,12 +2717,12 @@ static int transcode(AVFormatContext **output_files,

             goto discard_packet;

         }

-        //fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->index, pkt.size);

+        //fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->st->index, pkt.size);

         if (output_packet(ist, ist_index, ost_table, nb_ostreams, &pkt) < 0) {

             if (verbose >= 0)

                 fprintf(stderr, "Error while decoding stream #%d.%d\n",

-                        ist->file_index, ist->index);

+                        ist->file_index, ist->st->index);

             if (exit_on_error)

                 ffmpeg_exit(1);

             av_free_packet(&pkt);

@@ -2771,8 +2737,8 @@ static int transcode(AVFormatContext **output_files,

     }

     /* at the end of stream, we must flush the decoder buffers */

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

-        ist = ist_table[i];

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

+        ist = &input_streams[i];

         if (ist->decoding_needed) {

             output_packet(ist, i, ost_table, nb_ostreams, NULL);

         }

@@ -2802,8 +2768,8 @@ static int transcode(AVFormatContext **output_files,

     }

     /* close each decoder */

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

-        ist = ist_table[i];

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

+        ist = &input_streams[i];

         if (ist->decoding_needed) {

             avcodec_close(ist->st->codec);

         }

@@ -2814,15 +2780,7 @@ static int transcode(AVFormatContext **output_files,

  fail:

     av_freep(&bit_buffer);

-    av_free(file_table);

-    if (ist_table) {

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

-            ist = ist_table[i];

-            av_free(ist);

-        }

-        av_free(ist_table);

-    }

     if (ost_table) {

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

             ost = ost_table[i];

@@ -3375,8 +3333,17 @@ static void opt_input_file(const char *filename)

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

         AVStream *st = ic->streams[i];

         AVCodecContext *dec = st->codec;

+        AVInputStream *ist;

+

         dec->thread_count = thread_count;

         input_codecs = grow_array(input_codecs, sizeof(*input_codecs), &nb_input_codecs, nb_input_codecs + 1);

+

+        input_streams = grow_array(input_streams, sizeof(*input_streams), &nb_input_streams, nb_input_streams + 1);

+        ist = &input_streams[nb_input_streams - 1];

+        ist->st = st;

+        ist->file_index = nb_input_files;

+        ist->discard = 1;

+

         switch (dec->codec_type) {

         case AVMEDIA_TYPE_AUDIO:

             input_codecs[nb_input_codecs-1] = avcodec_find_decoder_by_name(audio_codec_name);

@@ -3449,13 +3416,14 @@ static void opt_input_file(const char *filename)

         }

     }

-    input_files[nb_input_files] = ic;

     input_files_ts_offset[nb_input_files] = input_ts_offset - (copy_ts ? 0 : timestamp);

     /* dump the file content */

     if (verbose >= 0)

         av_dump_format(ic, nb_input_files, filename, 0);

-    nb_input_files++;

+    input_files = grow_array(input_files, sizeof(*input_files), &nb_input_files, nb_input_files + 1);

+    input_files[nb_input_files - 1].ctx        = ic;

+    input_files[nb_input_files - 1].ist_index  = nb_input_streams - ic->nb_streams;

     video_channel = 0;

     top_field_first = -1;

@@ -3481,7 +3449,7 @@ static void check_inputs(int *has_video_ptr,

     has_data = 0;

     for(j=0;j<nb_input_files;j++) {

-        ic = input_files[j];

+        ic = input_files[j].ctx;

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

             AVCodecContext *enc = ic->streams[i]->codec;

             switch(enc->codec_type) {

@@ -4159,9 +4127,9 @@ static void opt_target(const char *arg)

             /* Try to determine PAL/NTSC by peeking in the input files */

             if(nb_input_files) {

                 int i, j;

-                for(j = 0; j < nb_input_files; j++) {

-                    for(i = 0; i < input_files[j]->nb_streams; i++) {

-                        AVCodecContext *c = input_files[j]->streams[i]->codec;

+                for (j = 0; j < nb_input_files; j++) {

+                    for (i = 0; i < input_files[j].ctx->nb_streams; i++) {

+                        AVCodecContext *c = input_files[j].ctx->streams[i]->codec;

                         if(c->codec_type != AVMEDIA_TYPE_VIDEO)

                             continue;

                         fr = c->time_base.den * 1000 / c->time_base.num;

@@ -70,33 +70,27 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx)

     case CODEC_ID_MPEG4:

         break;

     case CODEC_ID_MSMPEG4V1:

-        s->h263_msmpeg4 = 1;

         s->h263_pred = 1;

         s->msmpeg4_version=1;

         break;

     case CODEC_ID_MSMPEG4V2:

-        s->h263_msmpeg4 = 1;

         s->h263_pred = 1;

         s->msmpeg4_version=2;

         break;

     case CODEC_ID_MSMPEG4V3:

-        s->h263_msmpeg4 = 1;

         s->h263_pred = 1;

         s->msmpeg4_version=3;

         break;

     case CODEC_ID_WMV1:

-        s->h263_msmpeg4 = 1;

         s->h263_pred = 1;

         s->msmpeg4_version=4;

         break;

     case CODEC_ID_WMV2:

-        s->h263_msmpeg4 = 1;

         s->h263_pred = 1;

         s->msmpeg4_version=5;

         break;

     case CODEC_ID_VC1:

     case CODEC_ID_WMV3:

-        s->h263_msmpeg4 = 1;

         s->h263_pred = 1;

         s->msmpeg4_version=6;

         avctx->chroma_sample_location = AVCHROMA_LOC_LEFT;

@@ -672,7 +666,7 @@ retry:

         decode_slice(s);

     }

-    if (s->h263_msmpeg4 && s->msmpeg4_version<4 && s->pict_type==AV_PICTURE_TYPE_I)

+    if (s->msmpeg4_version && s->msmpeg4_version<4 && s->pict_type==AV_PICTURE_TYPE_I)

         if(!CONFIG_MSMPEG4_DECODER || msmpeg4_decode_ext_header(s, buf_size) < 0){

             s->error_status_table[s->mb_num-1]= AC_ERROR|DC_ERROR|MV_ERROR;

         }

@@ -2155,7 +2155,7 @@ void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64],

             }

             /* add dct residue */

-            if(s->encoding || !(   s->h263_msmpeg4 || s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO

+            if(s->encoding || !(   s->msmpeg4_version || s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO

                                 || (s->codec_id==CODEC_ID_MPEG4 && !s->mpeg_quant))){

                 add_dequant_dct(s, block[0], 0, dest_y                          , dct_linesize, s->qscale);

                 add_dequant_dct(s, block[1], 1, dest_y              + block_size, dct_linesize, s->qscale);

@@ -209,7 +209,6 @@ typedef struct MpegEncContext {

 /* the following codec id fields are deprecated in favor of codec_id */

     int h263_plus;    ///< h263 plus headers

-    int h263_msmpeg4; ///< generate MSMPEG4 compatible stream (deprecated, use msmpeg4_version instead)

     int h263_flv;     ///< use flv h263 header

     enum CodecID codec_id;     /* see CODEC_ID_xxx */

@@ -843,4 +842,3 @@ void ff_wmv2_encode_mb(MpegEncContext * s,

                        int motion_x, int motion_y);

 #endif /* AVCODEC_MPEGVIDEO_H */

-

@@ -640,7 +640,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)

         break;

     case CODEC_ID_MSMPEG4V2:

         s->out_format = FMT_H263;

-        s->h263_msmpeg4 = 1;

         s->h263_pred = 1;

         s->unrestricted_mv = 1;

         s->msmpeg4_version= 2;

@@ -649,7 +648,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)

         break;

     case CODEC_ID_MSMPEG4V3:

         s->out_format = FMT_H263;

-        s->h263_msmpeg4 = 1;

         s->h263_pred = 1;

         s->unrestricted_mv = 1;

         s->msmpeg4_version= 3;

@@ -659,7 +657,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)

         break;

     case CODEC_ID_WMV1:

         s->out_format = FMT_H263;

-        s->h263_msmpeg4 = 1;

         s->h263_pred = 1;

         s->unrestricted_mv = 1;

         s->msmpeg4_version= 4;

@@ -669,7 +666,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)

         break;

     case CODEC_ID_WMV2:

         s->out_format = FMT_H263;

-        s->h263_msmpeg4 = 1;

         s->h263_pred = 1;

         s->unrestricted_mv = 1;

         s->msmpeg4_version= 5;

@@ -2773,7 +2769,7 @@ static int encode_picture(MpegEncContext *s, int picture_number)

     /* we need to initialize some time vars before we can encode b-frames */

     // RAL: Condition added for MPEG1VIDEO

-    if (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO || (s->h263_pred && !s->h263_msmpeg4))

+    if (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO || (s->h263_pred && !s->msmpeg4_version))

         set_frame_distances(s);

     if(CONFIG_MPEG4_ENCODER && s->codec_id == CODEC_ID_MPEG4)

         ff_set_mpeg4_time(s);

@@ -2942,7 +2938,7 @@ static int encode_picture(MpegEncContext *s, int picture_number)

     case FMT_H263:

         if (CONFIG_WMV2_ENCODER && s->codec_id == CODEC_ID_WMV2)

             ff_wmv2_encode_picture_header(s, picture_number);

-        else if (CONFIG_MSMPEG4_ENCODER && s->h263_msmpeg4)

+        else if (CONFIG_MSMPEG4_ENCODER && s->msmpeg4_version)

             msmpeg4_encode_picture_header(s, picture_number);

         else if (CONFIG_MPEG4_ENCODER && s->h263_pred)

             mpeg4_encode_picture_header(s, picture_number);

@@ -47,6 +47,7 @@

 #include <alsa/asoundlib.h>

 #include "libavformat/avformat.h"

+#include "libavutil/opt.h"

 #include "alsa-audio.h"

@@ -56,21 +57,16 @@ static av_cold int audio_read_header(AVFormatContext *s1,

     AlsaData *s = s1->priv_data;

     AVStream *st;

     int ret;

-    unsigned int sample_rate;

     enum CodecID codec_id;

     snd_pcm_sw_params_t *sw_params;

-    if (ap->sample_rate <= 0) {

-        av_log(s1, AV_LOG_ERROR, "Bad sample rate %d\n", ap->sample_rate);

+#if FF_API_FORMAT_PARAMETERS

+    if (ap->sample_rate > 0)

+        s->sample_rate = ap->sample_rate;

-        return AVERROR(EIO);

-    }

-

-    if (ap->channels <= 0) {

-        av_log(s1, AV_LOG_ERROR, "Bad channels number %d\n", ap->channels);

-

-        return AVERROR(EIO);

-    }

+    if (ap->channels > 0)

+        s->channels = ap->channels;

+#endif

     st = av_new_stream(s1, 0);

     if (!st) {

@@ -78,10 +74,9 @@ static av_cold int audio_read_header(AVFormatContext *s1,

         return AVERROR(ENOMEM);

     }

-    sample_rate = ap->sample_rate;

     codec_id    = s1->audio_codec_id;

-    ret = ff_alsa_open(s1, SND_PCM_STREAM_CAPTURE, &sample_rate, ap->channels,

+    ret = ff_alsa_open(s1, SND_PCM_STREAM_CAPTURE, &s->sample_rate, s->channels,

         &codec_id);

     if (ret < 0) {

         return AVERROR(EIO);

@@ -113,8 +108,8 @@ static av_cold int audio_read_header(AVFormatContext *s1,

     /* take real parameters */

     st->codec->codec_type  = AVMEDIA_TYPE_AUDIO;

     st->codec->codec_id    = codec_id;

-    st->codec->sample_rate = sample_rate;

-    st->codec->channels    = ap->channels;

+    st->codec->sample_rate = s->sample_rate;

+    st->codec->channels    = s->channels;

     av_set_pts_info(st, 64, 1, 1000000);  /* 64 bits pts in us */

     return 0;

@@ -163,6 +158,19 @@ static int audio_read_packet(AVFormatContext *s1, AVPacket *pkt)

     return 0;

 }

+static const AVOption options[] = {

+    { "sample_rate", "", offsetof(AlsaData, sample_rate), FF_OPT_TYPE_INT, {.dbl = 48000}, 1, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },

+    { "channels",    "", offsetof(AlsaData, channels),    FF_OPT_TYPE_INT, {.dbl = 2},     1, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },

+    { NULL },

+};

+

+static const AVClass alsa_demuxer_class = {

+    .class_name     = "ALSA demuxer",

+    .item_name      = av_default_item_name,

+    .option         = options,

+    .version        = LIBAVUTIL_VERSION_INT,

+};

+

 AVInputFormat ff_alsa_demuxer = {

     "alsa",

     NULL_IF_CONFIG_SMALL("ALSA audio input"),

@@ -172,4 +180,5 @@ AVInputFormat ff_alsa_demuxer = {

     audio_read_packet,

     ff_alsa_close,

     .flags = AVFMT_NOFILE,

+    .priv_class = &alsa_demuxer_class,

 };

@@ -33,6 +33,7 @@

 #include <alsa/asoundlib.h>

 #include "config.h"

 #include "libavformat/avformat.h"

+#include "libavutil/log.h"

 /* XXX: we make the assumption that the soundcard accepts this format */

 /* XXX: find better solution with "preinit" method, needed also in

@@ -42,12 +43,15 @@

 typedef void (*ff_reorder_func)(const void *, void *, int);

 typedef struct {

+    AVClass *class;

     snd_pcm_t *h;

     int frame_size;  ///< preferred size for reads and writes

     int period_size; ///< bytes per sample * channels

     ff_reorder_func reorder_func;

     void *reorder_buf;

     int reorder_buf_size; ///< in frames

+    int sample_rate; ///< sample rate set by user

+    int channels;    ///< number of channels set by user

 } AlsaData;

 /**

@@ -25,6 +25,8 @@

  */

 #include "libavformat/avformat.h"

+#include "libavutil/log.h"

+#include "libavutil/opt.h"

 #if HAVE_DEV_BKTR_IOCTL_METEOR_H && HAVE_DEV_BKTR_IOCTL_BT848_H

 # include <dev/bktr/ioctl_meteor.h>

 # include <dev/bktr/ioctl_bt848.h>

@@ -47,12 +49,14 @@

 #include <strings.h>

 typedef struct {

+    AVClass *class;

     int video_fd;

     int tuner_fd;

     int width, height;

     int frame_rate;

     int frame_rate_base;

     uint64_t per_frame;

+    int standard;

 } VideoData;

@@ -245,7 +249,6 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)

     int width, height;

     int frame_rate;

     int frame_rate_base;

-    int format = -1;

     if (ap->width <= 0 || ap->height <= 0 || ap->time_base.den <= 0)

         return -1;

@@ -274,16 +277,18 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)

     st->codec->time_base.den = frame_rate;

     st->codec->time_base.num = frame_rate_base;

+#if FF_API_FORMAT_PARAMETERS

     if (ap->standard) {

         if (!strcasecmp(ap->standard, "pal"))

-            format = PAL;

+            s->standard = PAL;

         else if (!strcasecmp(ap->standard, "secam"))

-            format = SECAM;

+            s->standard = SECAM;

         else if (!strcasecmp(ap->standard, "ntsc"))

-            format = NTSC;

+            s->standard = NTSC;

     }

+#endif

-    if (bktr_init(s1->filename, width, height, format,

+    if (bktr_init(s1->filename, width, height, s->standard,

             &(s->video_fd), &(s->tuner_fd), -1, 0.0) < 0)

         return AVERROR(EIO);

@@ -311,6 +316,24 @@ static int grab_read_close(AVFormatContext *s1)

     return 0;

 }

+static const AVOption options[] = {

+    { "standard", "", offsetof(VideoData, standard), FF_OPT_TYPE_INT, {.dbl = VIDEO_FORMAT}, PAL, NTSCJ, AV_OPT_FLAG_DECODING_PARAM, "standard" },

+    { "PAL",      "", 0, FF_OPT_TYPE_CONST, {.dbl = PAL},   0, 0, AV_OPT_FLAG_DECODING_PARAM, "standard" },

+    { "NTSC",     "", 0, FF_OPT_TYPE_CONST, {.dbl = NTSC},  0, 0, AV_OPT_FLAG_DECODING_PARAM, "standard" },

+    { "SECAM",    "", 0, FF_OPT_TYPE_CONST, {.dbl = SECAM}, 0, 0, AV_OPT_FLAG_DECODING_PARAM, "standard" },

+    { "PALN",     "", 0, FF_OPT_TYPE_CONST, {.dbl = PALN},  0, 0, AV_OPT_FLAG_DECODING_PARAM, "standard" },

+    { "PALM",     "", 0, FF_OPT_TYPE_CONST, {.dbl = PALM},  0, 0, AV_OPT_FLAG_DECODING_PARAM, "standard" },

+    { "NTSCJ",    "", 0, FF_OPT_TYPE_CONST, {.dbl = NTSCJ}, 0, 0, AV_OPT_FLAG_DECODING_PARAM, "standard" },

+    { NULL },

+};

+

+static const AVClass bktr_class = {

+    .class_name = "BKTR grab interface",

+    .item_name  = av_default_item_name,

+    .option     = options,

+    .version    = LIBAVUTIL_VERSION_INT,

+};

+

 AVInputFormat ff_bktr_demuxer = {

     "bktr",

     NULL_IF_CONFIG_SMALL("video grab"),

@@ -320,4 +343,5 @@ AVInputFormat ff_bktr_demuxer = {

     grab_read_packet,

     grab_read_close,

     .flags = AVFMT_NOFILE,

+    .priv_class = &bktr_class,

 };

@@ -30,6 +30,8 @@

 #include <time.h>

 #include <strings.h>

+#include "libavutil/log.h"

+#include "libavutil/opt.h"

 #include "libavformat/avformat.h"

 #undef DV1394_DEBUG

@@ -38,6 +40,7 @@

 #include "dv1394.h"

 struct dv1394_data {

+    AVClass *class;

     int fd;

     int channel;

     int format;

@@ -90,15 +93,17 @@ static int dv1394_read_header(AVFormatContext * context, AVFormatParameters * ap

     if (!dv->dv_demux)

         goto failed;

-    if (ap->standard && !strcasecmp(ap->standard, "pal"))

-        dv->format = DV1394_PAL;

-    else

-        dv->format = DV1394_NTSC;

+#if FF_API_FORMAT_PARAMETERS