]> git.sesse.net Git - ffmpeg/blobdiff - ffmpeg.c
10000l
[ffmpeg] / ffmpeg.c
index 697005458921bc963a614f60034e9361eb8666f1..52492646dd4536dbca0ccfd267e5355e355fe2d1 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -79,7 +79,7 @@ static int frame_rate = 25;
 static int frame_rate_base = 1;
 static int video_bit_rate = 200*1000;
 static int video_bit_rate_tolerance = 4000*1000;
-static int video_qscale = 0;
+static float video_qscale = 0;
 static int video_qmin = 2;
 static int video_qmax = 31;
 static int video_mb_qmin = 2;
@@ -87,6 +87,8 @@ static int video_mb_qmax = 31;
 static int video_qdiff = 3;
 static float video_qblur = 0.5;
 static float video_qcomp = 0.5;
+static uint16_t *intra_matrix = NULL;
+static uint16_t *inter_matrix = NULL;
 #if 0 //experimental, (can be removed)
 static float video_rc_qsquish=1.0;
 static float video_rc_qmod_amp=0;
@@ -109,10 +111,20 @@ static int video_codec_id = CODEC_ID_NONE;
 static int same_quality = 0;
 static int b_frames = 0;
 static int mb_decision = FF_MB_DECISION_SIMPLE;
+static int mb_cmp = FF_CMP_SAD;
+static int sub_cmp = FF_CMP_SAD;
+static int cmp = FF_CMP_SAD;
 static int use_4mv = 0;
+static int use_obmc = 0;
 static int use_aic = 0;
+static int use_aiv = 0;
 static int use_umv = 0;
+static int use_alt_scan = 0;
+static int use_trell = 0;
+static int use_scan_offset = 0;
 static int do_deinterlace = 0;
+static int do_interlace_dct = 0;
+static int do_interlace_me = 0;
 static int workaround_bugs = FF_BUG_AUTODETECT;
 static int error_resilience = 2;
 static int error_concealment = 3;
@@ -120,8 +132,12 @@ static int dct_algo = 0;
 static int idct_algo = 0;
 static int use_part = 0;
 static int packet_size = 0;
+static int error_rate = 0;
 static int strict = 0;
+static int top_field_first = -1;
+static int noise_reduction = 0;
 static int debug = 0;
+static int debug_mv = 0;
 extern int loop_input; /* currently a hack */
 
 static int gop_size = 12;
@@ -133,6 +149,7 @@ static int audio_channels = 1;
 static int audio_codec_id = CODEC_ID_NONE;
 
 static int64_t recording_time = 0;
+static int64_t start_time = 0;
 static int file_overwrite = 0;
 static char *str_title = NULL;
 static char *str_author = NULL;
@@ -140,6 +157,7 @@ static char *str_copyright = NULL;
 static char *str_comment = NULL;
 static int do_benchmark = 0;
 static int do_hex_dump = 0;
+static int do_pkt_dump = 0;
 static int do_psnr = 0;
 static int do_vstats = 0;
 static int do_pass = 0;
@@ -199,11 +217,11 @@ typedef struct AVInputStream {
     int discard;             /* true if stream data should be discarded */
     int decoding_needed;     /* true if the packets must be decoded in 'raw_fifo' */
     int64_t sample_index;      /* current sample */
-    int frame_decoded;       /* true if a video or audio frame has been decoded */
 
     int64_t       start;     /* time when read started */
     unsigned long frame;     /* current frame */
-    AVFrac        next_pts;  /* synthetic pts for cases where pkt.pts == 0 */
+    int64_t       next_pts;  /* synthetic pts for cases where pkt.pts
+                                is not defined */
     int64_t       pts;       /* current pts */
 } AVInputStream;
 
@@ -458,7 +476,7 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void
 static void do_video_out(AVFormatContext *s, 
                          AVOutputStream *ost, 
                          AVInputStream *ist,
-                         AVPicture *in_picture,
+                         AVFrame *in_picture,
                          int *frame_size, AVOutputStream *audio_sync)
 {
     int nb_frames, i, ret;
@@ -515,15 +533,17 @@ static void do_video_out(AVFormatContext *s,
     }
     
 #if defined(AVSYNC_DEBUG)
-    static char *action[] = { "drop frame", "copy frame", "dup frame" };
-    if (audio_sync)
-        fprintf(stderr, "Input APTS %12.6f, output APTS %12.6f, ",
-               (double) audio_sync->sync_ipts, 
-               (double) audio_sync->st->pts.val * s->pts_num / s->pts_den);
-    fprintf(stderr, "Input VPTS %12.6f, output VPTS %12.6f: %s\n",
-            (double) ost->sync_ipts, 
-           (double) ost->st->pts.val * s->pts_num / s->pts_den,
-            action[nb_frames]);
+    {
+        static char *action[] = { "drop frame", "copy frame", "dup frame" };
+        if (audio_sync)
+            fprintf(stderr, "Input APTS %12.6f, output APTS %12.6f, ",
+                    (double) audio_sync->sync_ipts, 
+                    (double) audio_sync->st->pts.val * s->pts_num / s->pts_den);
+        fprintf(stderr, "Input VPTS %12.6f, output VPTS %12.6f: %s\n",
+                (double) ost->sync_ipts, 
+                (double) ost->st->pts.val * s->pts_num / s->pts_den,
+                action[nb_frames]);
+    }
 #endif
 
     if (nb_frames <= 0) 
@@ -540,21 +560,21 @@ static void do_video_out(AVFormatContext *s,
         int size;
 
         /* create temporary picture */
-        size = avpicture_get_size(enc->pix_fmt, dec->width, dec->height);
+        size = avpicture_get_size(target_pixfmt, dec->width, dec->height);
         buf = av_malloc(size);
         if (!buf)
             return;
         formatted_picture = &picture_format_temp;
-        avpicture_fill(formatted_picture, buf, enc->pix_fmt, dec->width, dec->height);
+        avpicture_fill(formatted_picture, buf, target_pixfmt, dec->width, dec->height);
         
         if (img_convert(formatted_picture, target_pixfmt, 
-                        in_picture, dec->pix_fmt, 
+                        (AVPicture *)in_picture, dec->pix_fmt, 
                         dec->width, dec->height) < 0) {
             fprintf(stderr, "pixel format conversion not handled\n");
             goto the_end;
         }
     } else {
-        formatted_picture = in_picture;
+        formatted_picture = (AVPicture *)in_picture;
     }
 
     /* XXX: resampling could be done before raw format convertion in
@@ -608,14 +628,26 @@ static void do_video_out(AVFormatContext *s,
             /* raw pictures are written as AVPicture structure to
                avoid any copies. We support temorarily the older
                method. */
+            AVFrame* old_frame = enc->coded_frame;
+           enc->coded_frame = dec->coded_frame;
             av_write_frame(s, ost->index, 
                            (uint8_t *)final_picture, sizeof(AVPicture));
+           enc->coded_frame = old_frame;
         } else {
             AVFrame big_picture;
             
             memset(&big_picture, 0, sizeof(AVFrame));
             *(AVPicture*)&big_picture= *final_picture;
-                        
+            /* better than nothing: use input picture interlaced
+               settings */
+            big_picture.interlaced_frame = in_picture->interlaced_frame;
+            if(do_interlace_me || do_interlace_dct){
+                if(top_field_first == -1)
+                    big_picture.top_field_first = in_picture->top_field_first;
+                else
+                    big_picture.top_field_first = 1;
+            }
+
             /* handles sameq here. This is not correct because it may
                not be a global option */
             if (same_quality) {
@@ -680,7 +712,7 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost,
     total_size += frame_size;
     if (enc->codec_type == CODEC_TYPE_VIDEO) {
         frame_number = ost->frame_number;
-        fprintf(fvstats, "frame= %5d q= %2.1f ", frame_number, enc->coded_frame->quality);
+        fprintf(fvstats, "frame= %5d q= %2.1f ", frame_number, enc->coded_frame->quality/(float)FF_QP2LAMBDA);
         if (enc->flags&CODEC_FLAG_PSNR)
             fprintf(fvstats, "PSNR= %6.2f ", psnr(enc->coded_frame->error[0]/(enc->width*enc->height*255.0*255.0)));
         
@@ -738,14 +770,35 @@ static void print_report(AVFormatContext **output_files,
         enc = &ost->st->codec;
         if (vid && enc->codec_type == CODEC_TYPE_VIDEO) {
             sprintf(buf + strlen(buf), "q=%2.1f ",
-                    enc->coded_frame->quality);
+                    enc->coded_frame->quality/(float)FF_QP2LAMBDA);
         }
         if (!vid && enc->codec_type == CODEC_TYPE_VIDEO) {
             frame_number = ost->frame_number;
             sprintf(buf + strlen(buf), "frame=%5d q=%2.1f ",
-                    frame_number, enc->coded_frame ? enc->coded_frame->quality : 0);
-            if (enc->flags&CODEC_FLAG_PSNR)
-                sprintf(buf + strlen(buf), "PSNR= %6.2f ", psnr(enc->coded_frame->error[0]/(enc->width*enc->height*255.0*255.0)));
+                    frame_number, enc->coded_frame ? enc->coded_frame->quality/(float)FF_QP2LAMBDA : 0);
+            if(is_last_report)
+                sprintf(buf + strlen(buf), "L");
+            if (enc->flags&CODEC_FLAG_PSNR){
+                int j;
+                double error, error_sum=0;
+                double scale, scale_sum=0;
+                char type[3]= {'Y','U','V'};
+                sprintf(buf + strlen(buf), "PSNR=");
+                for(j=0; j<3; j++){
+                    if(is_last_report){
+                        error= enc->error[j];
+                        scale= enc->width*enc->height*255.0*255.0*frame_number;
+                    }else{
+                        error= enc->coded_frame->error[j];
+                        scale= enc->width*enc->height*255.0*255.0;
+                    }
+                    if(j) scale/=4;
+                    error_sum += error;
+                    scale_sum += scale;
+                    sprintf(buf + strlen(buf), "%c:%2.2f ", type[j], psnr(error/scale));
+                }
+                sprintf(buf + strlen(buf), "*:%2.2f ", psnr(error_sum/scale_sum));
+            }
             vid = 1;
         }
         /* compute min output value */
@@ -771,6 +824,197 @@ static void print_report(AVFormatContext **output_files,
         fprintf(stderr, "\n");
 }
 
+/* pkt = NULL means EOF (needed to flush decoder buffers) */
+static int output_packet(AVInputStream *ist, int ist_index,
+                         AVOutputStream **ost_table, int nb_ostreams,
+                         AVPacket *pkt)
+{
+    AVFormatContext *os;
+    AVOutputStream *ost;
+    uint8_t *ptr;
+    int len, ret, i;
+    uint8_t *data_buf;
+    int data_size, got_picture;
+    AVFrame picture;
+    short samples[AVCODEC_MAX_AUDIO_FRAME_SIZE / 2];
+    void *buffer_to_free;
+        
+    if (pkt && pkt->pts != AV_NOPTS_VALUE) {
+        ist->pts = pkt->pts;
+    } else {
+        ist->pts = ist->next_pts;
+    }
+    
+    if (pkt == NULL) {
+        /* EOF handling */
+        ptr = NULL;
+        len = 0;
+        goto handle_eof;
+    }
+
+    len = pkt->size;
+    ptr = pkt->data;
+    while (len > 0) {
+    handle_eof:
+        /* decode the packet if needed */
+        data_buf = NULL; /* fail safe */
+        data_size = 0;
+        if (ist->decoding_needed) {
+            switch(ist->st->codec.codec_type) {
+            case CODEC_TYPE_AUDIO:
+                    /* XXX: could avoid copy if PCM 16 bits with same
+                       endianness as CPU */
+                ret = avcodec_decode_audio(&ist->st->codec, samples, &data_size,
+                                           ptr, len);
+                if (ret < 0)
+                    goto fail_decode;
+                ptr += ret;
+                len -= ret;
+                /* Some bug in mpeg audio decoder gives */
+                /* data_size < 0, it seems they are overflows */
+                if (data_size <= 0) {
+                    /* no audio frame */
+                    continue;
+                }
+                data_buf = (uint8_t *)samples;
+                ist->next_pts += ((int64_t)AV_TIME_BASE * data_size) / 
+                    (2 * ist->st->codec.channels);
+                break;
+            case CODEC_TYPE_VIDEO:
+                    data_size = (ist->st->codec.width * ist->st->codec.height * 3) / 2;
+                    /* XXX: allocate picture correctly */
+                    memset(&picture, 0, sizeof(picture));
+                    ret = avcodec_decode_video(&ist->st->codec, 
+                                               &picture, &got_picture, ptr, len);
+                    ist->st->quality= picture.quality;
+                    if (ret < 0) 
+                        goto fail_decode;
+                    if (!got_picture) {
+                        /* no picture yet */
+                        goto discard_packet;
+                    }
+                    if (ist->st->codec.frame_rate_base != 0) {
+                        ist->next_pts += ((int64_t)AV_TIME_BASE * 
+                                          ist->st->codec.frame_rate_base) /
+                            ist->st->codec.frame_rate;
+                    }
+                    len = 0;
+                    break;
+                default:
+                    goto fail_decode;
+                }
+            } else {
+                data_buf = ptr;
+                data_size = len;
+                ret = len;
+                len = 0;
+            }
+
+            buffer_to_free = NULL;
+            if (ist->st->codec.codec_type == CODEC_TYPE_VIDEO) {
+                pre_process_video_frame(ist, (AVPicture *)&picture, 
+                                        &buffer_to_free);
+            }
+
+            /* frame rate emulation */
+            if (ist->st->codec.rate_emu) {
+                int64_t pts = av_rescale((int64_t) ist->frame * ist->st->codec.frame_rate_base, 1000000, ist->st->codec.frame_rate);
+                int64_t now = av_gettime() - ist->start;
+                if (pts > now)
+                    usleep(pts - now);
+
+                ist->frame++;
+            }
+
+#if 0
+            /* mpeg PTS deordering : if it is a P or I frame, the PTS
+               is the one of the next displayed one */
+            /* XXX: add mpeg4 too ? */
+            if (ist->st->codec.codec_id == CODEC_ID_MPEG1VIDEO) {
+                if (ist->st->codec.pict_type != B_TYPE) {
+                    int64_t tmp;
+                    tmp = ist->last_ip_pts;
+                    ist->last_ip_pts  = ist->frac_pts.val;
+                    ist->frac_pts.val = tmp;
+                }
+            }
+#endif
+            /* if output time reached then transcode raw format, 
+              encode packets and output them */
+            if (start_time == 0 || ist->pts >= start_time)
+                for(i=0;i<nb_ostreams;i++) {
+                    int frame_size;
+
+                    ost = ost_table[i];
+                    if (ost->source_index == ist_index) {
+                        os = output_files[ost->file_index];
+
+#if 0
+                        printf("%d: got pts=%0.3f %0.3f\n", i, 
+                               (double)pkt->pts / AV_TIME_BASE, 
+                               ((double)ist->pts / AV_TIME_BASE) - 
+                               ((double)ost->st->pts.val * os->pts_num / os->pts_den));
+#endif
+                        /* set the input output pts pairs */
+                        ost->sync_ipts = (double)ist->pts / AV_TIME_BASE;
+                        /* XXX: take into account the various fifos,
+                           in particular for audio */
+                        ost->sync_opts = ost->st->pts.val;
+                        //printf("ipts=%lld sync_ipts=%f sync_opts=%lld pts.val=%lld pkt->pts=%lld\n", ist->pts, ost->sync_ipts, ost->sync_opts, ost->st->pts.val, pkt->pts); 
+
+                        if (ost->encoding_needed) {
+                            switch(ost->st->codec.codec_type) {
+                            case CODEC_TYPE_AUDIO:
+                                do_audio_out(os, ost, ist, data_buf, data_size);
+                                break;
+                            case CODEC_TYPE_VIDEO:
+                                /* find an audio stream for synchro */
+                                {
+                                    int i;
+                                    AVOutputStream *audio_sync, *ost1;
+                                    audio_sync = NULL;
+                                    for(i=0;i<nb_ostreams;i++) {
+                                        ost1 = ost_table[i];
+                                        if (ost1->file_index == ost->file_index &&
+                                            ost1->st->codec.codec_type == CODEC_TYPE_AUDIO) {
+                                            audio_sync = ost1;
+                                            break;
+                                        }
+                                    }
+
+                                    do_video_out(os, ost, ist, &picture, &frame_size, audio_sync);
+                                    if (do_vstats && frame_size)
+                                        do_video_stats(os, ost, frame_size);
+                                }
+                                break;
+                            default:
+                                av_abort();
+                            }
+                        } else {
+                            AVFrame avframe;
+                                                
+                            /* no reencoding needed : output the packet directly */
+                            /* force the input stream PTS */
+                        
+                            memset(&avframe, 0, sizeof(AVFrame));
+                            ost->st->codec.coded_frame= &avframe;
+                            avframe.key_frame = pkt->flags & PKT_FLAG_KEY; 
+                        
+                            av_write_frame(os, ost->index, data_buf, data_size);
+                            ost->st->codec.frame_number++;
+                            ost->frame_number++;
+                        }
+                    }
+                }
+            av_free(buffer_to_free);
+        }
+ discard_packet:
+    return 0;
+ fail_decode:
+    return -1;
+}
+
+
 /*
  * The following code is the main loop of the file converter
  */
@@ -1133,7 +1377,6 @@ static int av_encode(AVFormatContext **output_files,
             }
             //if (ist->st->codec.codec_type == CODEC_TYPE_VIDEO)
             //    ist->st->codec.flags |= CODEC_FLAG_REPEAT_FIELD;
-            ist->frame_decoded = 1;
         }
     }
 
@@ -1142,20 +1385,7 @@ static int av_encode(AVFormatContext **output_files,
         ist = ist_table[i];
        is = input_files[ist->file_index];
         ist->pts = 0;
-        if (ist->decoding_needed) {
-            switch (ist->st->codec.codec_type) {
-            case CODEC_TYPE_AUDIO:
-                av_frac_init(&ist->next_pts, 
-                             0, 0, (uint64_t)is->pts_num * ist->st->codec.sample_rate);
-                break;
-            case CODEC_TYPE_VIDEO:
-                av_frac_init(&ist->next_pts, 
-                             0, 0, (uint64_t)is->pts_num * ist->st->codec.frame_rate);
-                break;
-            default:
-                break;
-            }
-        }
+        ist->next_pts = 0;
     }
     
     /* compute buffer size max (should use a complete heuristic) */
@@ -1185,13 +1415,6 @@ static int av_encode(AVFormatContext **output_files,
     for(; received_sigterm == 0;) {
         int file_index, ist_index;
         AVPacket pkt;
-        uint8_t *ptr;
-        int len;
-        uint8_t *data_buf;
-        int data_size, got_picture;
-        AVPicture picture;
-        short samples[AVCODEC_MAX_AUDIO_FRAME_SIZE / 2];
-        void *buffer_to_free;
         double pts_min;
         
     redo:
@@ -1228,9 +1451,9 @@ static int av_encode(AVFormatContext **output_files,
         if (recording_time > 0 && pts_min >= (recording_time / 1000000.0))
             break;
 
-        /* read a packet from it and output it in the fifo */
+        /* read a frame from it and output it in the fifo */
         is = input_files[file_index];
-        if (av_read_packet(is, &pkt) < 0) {
+        if (av_read_frame(is, &pkt) < 0) {
             file_table[file_index].eof_reached = 1;
             continue;
         }
@@ -1239,9 +1462,8 @@ static int av_encode(AVFormatContext **output_files,
         } else {
             stream_no_data = 0;
         }
-        if (do_hex_dump) {
-            printf("stream #%d, size=%d:\n", pkt.stream_index, pkt.size);
-            av_hex_dump(pkt.data, pkt.size);
+        if (do_pkt_dump) {
+            av_pkt_dump(stdout, &pkt, do_hex_dump);
         }
         /* the following test is needed in case new streams appear
            dynamically in stream : we ignore them */
@@ -1252,192 +1474,29 @@ static int av_encode(AVFormatContext **output_files,
         if (ist->discard)
             goto discard_packet;
 
-        // printf("read #%d.%d size=%d\n", ist->file_index, ist->index, pkt.size);
-
-        len = pkt.size;
-        ptr = pkt.data;
-        while (len > 0) {
-            /* decode the packet if needed */
-            data_buf = NULL; /* fail safe */
-            data_size = 0;
-            if (ist->decoding_needed) {
-                /* NOTE1: we only take into account the PTS if a new
-                   frame has begun (MPEG semantics) */
-                /* NOTE2: even if the fraction is not initialized,
-                   av_frac_set can be used to set the integer part */
-                if (ist->frame_decoded) { 
-                    /* If pts is unavailable -- we have to use synthetic one */
-                    if( pkt.pts != AV_NOPTS_VALUE )
-                    {
-                        ist->pts = ist->next_pts.val = pkt.pts;
-                    }
-                    else
-                    {
-                        ist->pts = ist->next_pts.val;
-                    }
-                    ist->frame_decoded = 0;
-                }
-
-                switch(ist->st->codec.codec_type) {
-                case CODEC_TYPE_AUDIO:
-                    /* XXX: could avoid copy if PCM 16 bits with same
-                       endianness as CPU */
-                    ret = avcodec_decode_audio(&ist->st->codec, samples, &data_size,
-                                               ptr, len);
-                    if (ret < 0)
-                        goto fail_decode;
-                    /* Some bug in mpeg audio decoder gives */
-                    /* data_size < 0, it seems they are overflows */
-                    if (data_size <= 0) {
-                        /* no audio frame */
-                        ptr += ret;
-                        len -= ret;
-                        continue;
-                    }
-                    data_buf = (uint8_t *)samples;
-                   av_frac_add(&ist->next_pts, 
-                               (uint64_t)is->pts_den * data_size / (2 * ist->st->codec.channels));
-                    break;
-                case CODEC_TYPE_VIDEO:
-                    {
-                        AVFrame big_picture;
-
-                        data_size = (ist->st->codec.width * ist->st->codec.height * 3) / 2;
-                        ret = avcodec_decode_video(&ist->st->codec, 
-                                                   &big_picture, &got_picture, ptr, len);
-                        picture= *(AVPicture*)&big_picture;
-                        ist->st->quality= big_picture.quality;
-                        if (ret < 0) {
-                        fail_decode:
-                            fprintf(stderr, "Error while decoding stream #%d.%d\n",
-                                    ist->file_index, ist->index);
-                            av_free_packet(&pkt);
-                            goto redo;
-                        }
-                        if (!got_picture) {
-                            /* no picture yet */
-                            ptr += ret;
-                            len -= ret;
-                            continue;
-                        }
-                        av_frac_add(&ist->next_pts, 
-                                   (uint64_t)is->pts_den * ist->st->codec.frame_rate_base);          
-                    }
-                    break;
-                default:
-                    goto fail_decode;
-                }
-            } else {
-                data_buf = ptr;
-                data_size = len;
-                ret = len;
-            }
-            ptr += ret;
-            len -= ret;
-
-            buffer_to_free = 0;
-            if (ist->st->codec.codec_type == CODEC_TYPE_VIDEO) {
-                pre_process_video_frame(ist, &picture, &buffer_to_free);
-            }
-
-            ist->frame_decoded = 1;
-
-            /* frame rate emulation */
-            if (ist->st->codec.rate_emu) {
-                int64_t pts = av_rescale((int64_t) ist->frame * ist->st->codec.frame_rate_base, 1000000, ist->st->codec.frame_rate);
-                int64_t now = av_gettime() - ist->start;
-                if (pts > now)
-                    usleep(pts - now);
-
-                ist->frame++;
-            }
-
-#if 0
-            /* mpeg PTS deordering : if it is a P or I frame, the PTS
-               is the one of the next displayed one */
-            /* XXX: add mpeg4 too ? */
-            if (ist->st->codec.codec_id == CODEC_ID_MPEG1VIDEO) {
-                if (ist->st->codec.pict_type != B_TYPE) {
-                    int64_t tmp;
-                    tmp = ist->last_ip_pts;
-                    ist->last_ip_pts  = ist->frac_pts.val;
-                    ist->frac_pts.val = tmp;
-                }
-            }
-#endif
-            /* transcode raw format, encode packets and output them */
-
-            for(i=0;i<nb_ostreams;i++) {
-                int frame_size;
-
-                ost = ost_table[i];
-                if (ost->source_index == ist_index) {
-                    os = output_files[ost->file_index];
-
-#if 0
-                    printf("%d: got pts=%f %f\n", i, pkt.pts / 90000.0, 
-                           (ist->pts - ost->st->pts.val) / 90000.0);
-#endif
-                    /* set the input output pts pairs */
-                    ost->sync_ipts = (double)ist->pts * is->pts_num / 
-                        is->pts_den;
-                    /* XXX: take into account the various fifos,
-                       in particular for audio */
-                    ost->sync_opts = ost->st->pts.val;
-                    //printf("ipts=%lld sync_ipts=%f sync_opts=%lld pts.val=%lld pkt.pts=%lld\n", ist->pts, ost->sync_ipts, ost->sync_opts, ost->st->pts.val, pkt.pts); 
-
-                    if (ost->encoding_needed) {
-                        switch(ost->st->codec.codec_type) {
-                        case CODEC_TYPE_AUDIO:
-                            do_audio_out(os, ost, ist, data_buf, data_size);
-                            break;
-                        case CODEC_TYPE_VIDEO:
-                            /* find an audio stream for synchro */
-                            {
-                                int i;
-                                AVOutputStream *audio_sync, *ost1;
-                                audio_sync = NULL;
-                                for(i=0;i<nb_ostreams;i++) {
-                                    ost1 = ost_table[i];
-                                    if (ost1->file_index == ost->file_index &&
-                                        ost1->st->codec.codec_type == CODEC_TYPE_AUDIO) {
-                                        audio_sync = ost1;
-                                        break;
-                                    }
-                                }
-
-                                do_video_out(os, ost, ist, &picture, &frame_size, audio_sync);
-                                if (do_vstats && frame_size)
-                                    do_video_stats(os, ost, frame_size);
-                            }
-                            break;
-                        default:
-                            av_abort();
-                        }
-                    } else {
-                        AVFrame avframe;
-                                                
-                        /* no reencoding needed : output the packet directly */
-                        /* force the input stream PTS */
-                        
-                        memset(&avframe, 0, sizeof(AVFrame));
-                        ost->st->codec.coded_frame= &avframe;
-                       avframe.key_frame = pkt.flags & PKT_FLAG_KEY; 
-                        
-                        av_write_frame(os, ost->index, data_buf, data_size);
-                       ost->st->codec.frame_number++;
-                       ost->frame_number++;
-                    }
-                }
-            }
-            av_free(buffer_to_free);
+        //fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->index, pkt.size);
+        if (output_packet(ist, ist_index, ost_table, nb_ostreams, &pkt) < 0) {
+            fprintf(stderr, "Error while decoding stream #%d.%d\n",
+                    ist->file_index, ist->index);
+            av_free_packet(&pkt);
+            goto redo;
         }
+        
     discard_packet:
         av_free_packet(&pkt);
         
         /* dump report by using the output first video and audio streams */
         print_report(output_files, ost_table, nb_ostreams, 0);
     }
+
+    /* at the end of stream, we must flush the decoder buffers */
+    for(i=0;i<nb_istreams;i++) {
+        ist = ist_table[i];
+        if (ist->decoding_needed) {
+            output_packet(ist, i, ost_table, nb_ostreams, NULL);
+        }
+    }
+
     term_exit();
 
     /* dump report by using the first video and audio streams */
@@ -1580,7 +1639,7 @@ static void opt_video_bitrate_min(const char *arg)
 
 static void opt_video_buffer_size(const char *arg)
 {
-    video_rc_buffer_size = atoi(arg) * 1000;
+    video_rc_buffer_size = atoi(arg) * 1024;
 }
 
 static void opt_video_rc_eq(char *arg)
@@ -1625,6 +1684,11 @@ static void opt_debug(const char *arg)
     debug = atoi(arg);
 }
 
+static void opt_vismv(const char *arg)
+{
+    debug_mv = atoi(arg);
+}
+    
 static void opt_verbose(const char *arg)
 {
     verbose = atoi(arg);
@@ -1772,12 +1836,27 @@ static void opt_mb_decision(const char *arg)
     mb_decision = atoi(arg);
 }
 
+static void opt_mb_cmp(const char *arg)
+{
+    mb_cmp = atoi(arg);
+}
+
+static void opt_sub_cmp(const char *arg)
+{
+    sub_cmp = atoi(arg);
+}
+
+static void opt_cmp(const char *arg)
+{
+    cmp = atoi(arg);
+}
+
 static void opt_qscale(const char *arg)
 {
-    video_qscale = atoi(arg);
-    if (video_qscale < 0 ||
-        video_qscale > 31) {
-        fprintf(stderr, "qscale must be >= 1 and <= 31\n");
+    video_qscale = atof(arg);
+    if (video_qscale < 0.01 ||
+        video_qscale > 255) {
+        fprintf(stderr, "qscale must be >= 0.01 and <= 255\n");
         exit(1);
     }
 }
@@ -1868,11 +1947,26 @@ static void opt_packet_size(const char *arg)
     packet_size= atoi(arg);
 }
 
+static void opt_error_rate(const char *arg)
+{
+    error_rate= atoi(arg);
+}
+
 static void opt_strict(const char *arg)
 {
     strict= atoi(arg);
 }
 
+static void opt_top_field_first(const char *arg)
+{
+    top_field_first= atoi(arg);
+}
+
+static void opt_noise_reduction(const char *arg)
+{
+    noise_reduction= atoi(arg);
+}
+
 static void opt_audio_bitrate(const char *arg)
 {
     audio_bit_rate = atoi(arg) * 1000;
@@ -2025,6 +2119,11 @@ static void opt_recording_time(const char *arg)
     recording_time = parse_date(arg, 1);
 }
 
+static void opt_start_time(const char *arg)
+{
+    start_time = parse_date(arg, 1);
+}
+
 static void opt_input_file(const char *filename)
 {
     AVFormatContext *ic;
@@ -2063,6 +2162,23 @@ static void opt_input_file(const char *filename)
         exit(1);
     }
 
+    /* if seeking requested, we execute it */
+    if (start_time != 0) {
+        int64_t timestamp;
+
+        timestamp = start_time;
+        /* add the stream start time */
+        if (ic->start_time != AV_NOPTS_VALUE)
+            timestamp += ic->start_time;
+        ret = av_seek_frame(ic, -1, timestamp);
+        if (ret < 0) {
+            fprintf(stderr, "%s: could not seek to position %0.3f\n", 
+                    filename, (double)timestamp / AV_TIME_BASE);
+        }
+        /* reset seek info */
+        start_time = 0;
+    }
+
     /* update the current parameters so that they match the one of the input stream */
     for(i=0;i<ic->nb_streams;i++) {
         AVCodecContext *enc = &ic->streams[i]->codec;
@@ -2075,20 +2191,16 @@ static void opt_input_file(const char *filename)
         case CODEC_TYPE_VIDEO:
             frame_height = enc->height;
             frame_width = enc->width;
-           frame_aspect_ratio = enc->aspect_ratio;
+           frame_aspect_ratio = av_q2d(enc->sample_aspect_ratio) * enc->width / enc->height;
            frame_pix_fmt = enc->pix_fmt;
             rfps      = ic->streams[i]->r_frame_rate;
             rfps_base = ic->streams[i]->r_frame_rate_base;
             enc->workaround_bugs = workaround_bugs;
             enc->error_resilience = error_resilience; 
             enc->error_concealment = error_concealment; 
-            enc->idct_algo= idct_algo;
-            enc->debug= debug;
-/*            if(enc->codec->capabilities & CODEC_CAP_TRUNCATED)
-                enc->flags|= CODEC_FLAG_TRUNCATED; */
-            if(/*enc->codec_id==CODEC_ID_MPEG4 || */enc->codec_id==CODEC_ID_MPEG1VIDEO || enc->codec_id==CODEC_ID_H264)
-                enc->flags|= CODEC_FLAG_TRUNCATED;
-            
+            enc->idct_algo = idct_algo;
+            enc->debug = debug;
+            enc->debug_mv = debug_mv;            
             if(bitexact)
                 enc->flags|= CODEC_FLAG_BITEXACT;
 
@@ -2104,6 +2216,8 @@ static void opt_input_file(const char *filename)
 
             enc->rate_emu = rate_emu;
             break;
+        case CODEC_TYPE_DATA:
+            break;
         default:
             av_abort();
         }
@@ -2236,7 +2350,7 @@ static void opt_output_file(const char *filename)
                 
                 video_enc->width = frame_width;
                 video_enc->height = frame_height;
-               video_enc->aspect_ratio = frame_aspect_ratio;
+               video_enc->sample_aspect_ratio = av_d2q(frame_aspect_ratio*frame_height/frame_width, 255);
                video_enc->pix_fmt = frame_pix_fmt;
 
                 if (!intra_only)
@@ -2245,13 +2359,21 @@ static void opt_output_file(const char *filename)
                     video_enc->gop_size = 0;
                 if (video_qscale || same_quality) {
                     video_enc->flags |= CODEC_FLAG_QSCALE;
-                    st->quality = video_qscale;
+                    st->quality = FF_QP2LAMBDA * video_qscale;
                 }
-                
+
+                if(intra_matrix)
+                    video_enc->intra_matrix = intra_matrix;
+                if(inter_matrix)
+                    video_enc->inter_matrix = inter_matrix;
+
                 if(bitexact)
                     video_enc->flags |= CODEC_FLAG_BITEXACT;
 
                 video_enc->mb_decision = mb_decision;
+                video_enc->mb_cmp = mb_cmp;
+                video_enc->me_sub_cmp = sub_cmp;
+                video_enc->me_cmp = cmp;
                 
                 if (use_umv) {
                     video_enc->flags |= CODEC_FLAG_H263P_UMV;
@@ -2259,21 +2381,39 @@ static void opt_output_file(const char *filename)
                if (use_aic) {
                     video_enc->flags |= CODEC_FLAG_H263P_AIC;
                 }
+               if (use_aiv) {
+                    video_enc->flags |= CODEC_FLAG_H263P_AIV;
+                }
                 if (use_4mv) {
-                    video_enc->mb_decision = FF_MB_DECISION_BITS; //FIXME remove
                     video_enc->flags |= CODEC_FLAG_4MV;
                 }
+                if (use_obmc) {
+                    video_enc->flags |= CODEC_FLAG_OBMC;
+                }
             
-                if(use_part)
+                if(use_part) {
                     video_enc->flags |= CODEC_FLAG_PART;
-               
-            
+                }
+               if (use_alt_scan) {
+                    video_enc->flags |= CODEC_FLAG_ALT_SCAN;
+                }
+               if (use_trell) {
+                    video_enc->flags |= CODEC_FLAG_TRELLIS_QUANT;
+                }
+               if (use_scan_offset) {
+                    video_enc->flags |= CODEC_FLAG_SVCD_SCAN_OFFSET;
+                }
                 if (b_frames) {
                     video_enc->max_b_frames = b_frames;
                     video_enc->b_frame_strategy = 0;
                     video_enc->b_quant_factor = 2.0;
                 }
-            
+                if (do_interlace_dct) {
+                    video_enc->flags |= CODEC_FLAG_INTERLACED_DCT;
+                }
+                if (do_interlace_me) {
+                    video_enc->flags |= CODEC_FLAG_INTERLACED_ME;
+                }
                 video_enc->qmin = video_qmin;
                 video_enc->qmax = video_qmax;
                 video_enc->mb_qmin = video_mb_qmin;
@@ -2282,8 +2422,8 @@ static void opt_output_file(const char *filename)
                 video_enc->qblur = video_qblur;
                 video_enc->qcompress = video_qcomp;
                 video_enc->rc_eq = video_rc_eq;
-                video_enc->debug= debug;
-                
+                video_enc->debug = debug;
+                video_enc->debug_mv = debug_mv;                
                 p= video_rc_override_string;
                 for(i=0; p; i++){
                     int start, end, q;
@@ -2322,6 +2462,8 @@ static void opt_output_file(const char *filename)
                 video_enc->dct_algo = dct_algo;
                 video_enc->idct_algo = idct_algo;
                 video_enc->strict_std_compliance = strict;
+                video_enc->error_rate = error_rate;
+                video_enc->noise_reduction= noise_reduction;
                 if(packet_size){
                     video_enc->rtp_mode= 1;
                     video_enc->rtp_payload_size= packet_size;
@@ -2357,6 +2499,9 @@ static void opt_output_file(const char *filename)
 
             audio_enc = &st->codec;
             audio_enc->codec_type = CODEC_TYPE_AUDIO;
+
+            if(!strcmp(file_oformat->name, "mp4") || !strcmp(file_oformat->name, "mov") || !strcmp(file_oformat->name, "3gp"))
+                audio_enc->flags |= CODEC_FLAG_GLOBAL_HEADER;
             if (audio_stream_copy) {
                 st->stream_copy = 1;
             } else {
@@ -2518,6 +2663,12 @@ static void prepare_grab(void)
             fprintf(stderr, "Could not find video grab device\n");
             exit(1);
         }
+        /* If not enough info to get the stream parameters, we decode the
+           first frames to get it. */
+       if ((ic->ctx_flags & AVFMTCTX_NOHEADER) && av_find_stream_info(ic) < 0) {
+            fprintf(stderr, "Could not find video grab parameters\n");
+            exit(1);
+        }
         /* by now video grab has one stream */
         ic->streams[0]->r_frame_rate      = vp->frame_rate;
         ic->streams[0]->r_frame_rate_base = vp->frame_rate_base;
@@ -2649,6 +2800,144 @@ static void show_formats(void)
     exit(1);
 }
 
+void parse_matrix_coeffs(uint16_t *dest, const char *str)
+{
+    int i;
+    const char *p = str;
+    for(i = 0;; i++) {
+        dest[i] = atoi(p);
+        if(i == 63)
+            break;
+        p = strchr(p, ',');
+        if(!p) {
+            fprintf(stderr, "Syntax error in matrix \"%s\" at coeff %d\n", str, i);
+            exit(1);
+        }
+        p++;
+    }
+}
+
+void opt_inter_matrix(const char *arg)
+{
+    inter_matrix = av_mallocz(sizeof(uint16_t) * 64);
+    parse_matrix_coeffs(inter_matrix, arg);
+}
+
+void opt_intra_matrix(const char *arg)
+{
+    intra_matrix = av_mallocz(sizeof(uint16_t) * 64);
+    parse_matrix_coeffs(intra_matrix, arg);
+}
+
+static void opt_target(const char *arg)
+{
+    int norm = -1;
+
+    if(!strncmp(arg, "pal-", 4)) {
+        norm = 0;
+        arg += 4;
+    } else if(!strncmp(arg, "ntsc-", 5)) {
+        norm = 1;
+        arg += 5;
+    } else {
+        int fr;
+        /* Calculate FR via float to avoid int overflow */
+        fr = (int)(frame_rate * 1000.0 / frame_rate_base);
+        if(fr == 25000) {
+            norm = 0;
+        } else if((fr == 29970) || (fr == 23976)) {
+            norm = 1;
+        } else {
+            /* 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;
+                        if(c->codec_type != CODEC_TYPE_VIDEO)
+                            continue;
+                        fr = c->frame_rate * 1000 / c->frame_rate_base;
+                        if(fr == 25000) {
+                            norm = 0;
+                            break;
+                        } else if((fr == 29970) || (fr == 23976)) {
+                            norm = 1;
+                            break;
+                        }
+                    }
+                    if(norm >= 0)
+                        break;
+                }
+            }
+        }
+        if(verbose && norm >= 0)
+            printf("Assuming %s for target.\n", norm ? "NTSC" : "PAL");
+    }
+
+    if(norm < 0) {
+        fprintf(stderr, "Could not determine norm (PAL/NTSC) for target.\n");
+        fprintf(stderr, "Please prefix target with \"pal-\" or \"ntsc-\",\n");
+        fprintf(stderr, "or set a framerate with \"-r xxx\".\n");
+        exit(1);
+    }
+
+    if(!strcmp(arg, "vcd")) {
+
+        opt_video_codec("mpeg1video");
+        opt_audio_codec("mp2");
+        opt_format("vcd");
+
+        opt_frame_size(norm ? "352x240" : "352x288");
+
+        video_bit_rate = 1150000;
+        video_rc_max_rate = 1150000;
+        video_rc_min_rate = 1150000;
+        video_rc_buffer_size = 40*1024*8;
+
+        audio_bit_rate = 224000;
+        audio_sample_rate = 44100;
+
+    } else if(!strcmp(arg, "svcd")) {
+
+        opt_video_codec("mpeg2video");
+        opt_audio_codec("mp2");
+        opt_format("vcd");
+
+        opt_frame_size(norm ? "480x480" : "480x576");
+        opt_gop_size(norm ? "18" : "15");
+
+        video_bit_rate = 2040000;
+        video_rc_max_rate = 2516000;
+        video_rc_min_rate = 0; //1145000;
+        video_rc_buffer_size = 224*1024*8;
+        use_scan_offset = 1;
+
+        audio_bit_rate = 224000;
+        audio_sample_rate = 44100;
+
+    } else if(!strcmp(arg, "dvd")) {
+
+        opt_video_codec("mpeg2video");
+        opt_audio_codec("ac3");
+        opt_format("vob");
+
+        opt_frame_size(norm ? "720x480" : "720x576");
+        opt_gop_size(norm ? "18" : "15");
+
+        video_bit_rate = 6000000;
+        video_rc_max_rate = 9000000;
+        video_rc_min_rate = 0; //1500000;
+        video_rc_buffer_size = 224*1024*8;
+
+        audio_bit_rate = 448000;
+        audio_sample_rate = 48000;
+
+    } else {
+        fprintf(stderr, "Unknown target: %s\n", arg);
+        exit(1);
+    }
+}
+
 const OptionDef options[] = {
     /* main options */
     { "L", 0, {(void*)show_license}, "show license" },
@@ -2660,19 +2949,24 @@ const OptionDef options[] = {
     { "y", OPT_BOOL, {(void*)&file_overwrite}, "overwrite output files" },
     { "map", HAS_ARG | OPT_EXPERT, {(void*)opt_map}, "set input stream mapping", "file:stream" },
     { "t", HAS_ARG, {(void*)opt_recording_time}, "set the recording time", "duration" },
+    { "ss", HAS_ARG, {(void*)opt_start_time}, "set the start time offset", "time_off" },
     { "title", HAS_ARG | OPT_STRING, {(void*)&str_title}, "set the title", "string" },
     { "author", HAS_ARG | OPT_STRING, {(void*)&str_author}, "set the author", "string" },
     { "copyright", HAS_ARG | OPT_STRING, {(void*)&str_copyright}, "set the copyright", "string" },
     { "comment", HAS_ARG | OPT_STRING, {(void*)&str_comment}, "set the comment", "string" },
     { "debug", HAS_ARG | OPT_EXPERT, {(void*)opt_debug}, "print specific debug info", "" },
+    { "vismv", HAS_ARG | OPT_EXPERT, {(void*)opt_vismv}, "visualize motion vectors", "" },
     { "benchmark", OPT_BOOL | OPT_EXPERT, {(void*)&do_benchmark}, 
       "add timings for benchmarking" },
-    { "hex", OPT_BOOL | OPT_EXPERT, {(void*)&do_hex_dump}, 
+    { "dump", OPT_BOOL | OPT_EXPERT, {(void*)&do_pkt_dump}, 
       "dump each input packet" },
+    { "hex", OPT_BOOL | OPT_EXPERT, {(void*)&do_hex_dump}, 
+      "when dumping packets, also dump the payload" },
     { "bitexact", OPT_EXPERT, {(void*)opt_bitexact}, "only use bit exact algorithms (for codec testing)" }, 
     { "re", OPT_BOOL | OPT_EXPERT, {(void*)&rate_emu}, "read input at native frame rate", "" },
     { "loop", OPT_BOOL | OPT_EXPERT, {(void*)&loop_input}, "loop (current only works with images)" },
     { "v", HAS_ARG, {(void*)opt_verbose}, "control amount of logging", "verbose" },
+    { "target", HAS_ARG, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\" or \"dvd\")", "type" },
 
     /* video options */
     { "b", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate}, "set video bitrate (in kbit/s)", "bitrate" },
@@ -2717,10 +3011,15 @@ const OptionDef options[] = {
     { "bf", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_b_frames}, "use 'frames' B frames", "frames" },
     { "hq", OPT_BOOL, {(void*)&mb_decision}, "activate high quality settings" },
     { "mbd", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_decision}, "macroblock decision", "mode" },
-    { "4mv", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_4mv}, "use four motion vector by macroblock (only MPEG-4)" },
-    { "part", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_part}, "use data partitioning (only MPEG-4)" },
+    { "mbcmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_cmp}, "macroblock compare function", "cmp function" },
+    { "subcmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_sub_cmp}, "subpel compare function", "cmp function" },
+    { "cmp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_cmp}, "fullpel compare function", "cmp function" },
+    { "4mv", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_4mv}, "use four motion vector by macroblock (MPEG4)" },
+    { "obmc", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_obmc}, "use overlapped block motion compensation (h263+)" },
+    { "part", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_part}, "use data partitioning (MPEG4)" },
     { "bug", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_workaround_bugs}, "workaround not auto detected encoder bugs", "param" },
     { "ps", HAS_ARG | OPT_EXPERT, {(void*)opt_packet_size}, "set packet size in bits", "size" },
+    { "error", HAS_ARG | OPT_EXPERT, {(void*)opt_error_rate}, "error rate", "rate" },
     { "strict", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_strict}, "how strictly to follow the standarts", "strictness" },
     { "sameq", OPT_BOOL | OPT_VIDEO, {(void*)&same_quality}, 
       "use same video quality as source (implies VBR)" },
@@ -2728,11 +3027,23 @@ const OptionDef options[] = {
     { "passlogfile", HAS_ARG | OPT_STRING | OPT_VIDEO, {(void*)&pass_logfilename}, "select two pass log file name", "file" },
     { "deinterlace", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_deinterlace}, 
       "deinterlace pictures" },
+    { "ildct", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_interlace_dct}, 
+      "force interlaced dct support in encoder (MPEG2/MPEG4)" },
+    { "ilme", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_interlace_me}, 
+      "force interlacied me support in encoder MPEG2" },
     { "psnr", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_psnr}, "calculate PSNR of compressed frames" },
     { "vstats", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_vstats}, "dump video coding statistics to file" }, 
     { "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" },
     { "aic", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_aic}, "enable Advanced intra coding (h263+)" },
+    { "aiv", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_aiv}, "enable Alternative inter vlc (h263+)" },
     { "umv", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_umv}, "enable Unlimited Motion Vector (h263+)" },
+    { "alt", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_alt_scan}, "enable alternate scantable (mpeg2)" },
+    { "trell", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_trell}, "enable trellis quantization" },
+    { "scan_offset", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_scan_offset}, "enable SVCD Scan Offset placeholder" },
+    { "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_intra_matrix}, "specify intra matrix coeffs", "matrix" },
+    { "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_inter_matrix}, "specify inter matrix coeffs", "matrix" },
+    { "top", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_top_field_first}, "top=1/bottom=0/auto=-1 field first", "" },
+    { "nr", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_noise_reduction}, "noise reduction", "" },
 
     /* audio options */
     { "ab", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_bitrate}, "set audio bitrate (in kbit/s)", "bitrate", },
@@ -2857,6 +3168,10 @@ int main(int argc, char **argv)
 
     av_free_static();
 
+    if(intra_matrix)
+        av_free(intra_matrix);
+    if(inter_matrix)
+        av_free(inter_matrix);
     
 #ifdef POWERPC_PERFORMANCE_REPORT
     extern void powerpc_display_perf_report(void);