]> git.sesse.net Git - ffmpeg/blobdiff - ffmpeg.c
* fixing bug that prevented resampling the picture and
[ffmpeg] / ffmpeg.c
index 06050d805ab1df950a9fe2a8c0b7bfba994861de..697005458921bc963a614f60034e9361eb8666f1 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1,6 +1,6 @@
 /*
  * FFmpeg main 
- * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
+ * Copyright (c) 2000-2003 Fabrice Bellard
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,7 +18,7 @@
  */
 #define HAVE_AV_CONFIG_H
 #include "avformat.h"
-#include "tick.h"
+#include "framehook.h"
 
 #ifndef CONFIG_WIN32
 #include <unistd.h>
 #include <sys/time.h>
 #include <termios.h>
 #include <sys/resource.h>
+#include <signal.h>
 #endif
-#ifdef __BEOS__
-/* for snooze() */
-#include <OS.h>
+#ifdef CONFIG_OS2
+#include <sys/types.h>
+#include <sys/select.h>
+#include <stdlib.h>
 #endif
 #include <time.h>
-#include <ctype.h>
-
-
-#define MAXINT64 INT64_C(0x7fffffffffffffff)
-
-typedef struct {
-    const char *name;
-    int flags;
-#define HAS_ARG    0x0001
-#define OPT_BOOL   0x0002
-#define OPT_EXPERT 0x0004
-#define OPT_STRING 0x0008
-    union {
-        void (*func_arg)();
-        int *int_arg;
-        char **str_arg;
-    } u;
-    const char *help;
-    const char *argname;
-} OptionDef;
+
+#include "cmdutils.h"
+
+#if !defined(INFINITY) && defined(HUGE_VAL)
+#define INFINITY HUGE_VAL
+#endif
 
 /* select an input stream for an output stream */
 typedef struct AVStreamMap {
@@ -62,7 +50,8 @@ typedef struct AVStreamMap {
 
 extern const OptionDef options[];
 
-void show_help(void);
+static void show_help(void);
+static void show_license(void);
 
 #define MAX_FILES 20
 
@@ -77,24 +66,32 @@ static int nb_stream_maps;
 
 static AVInputFormat *file_iformat;
 static AVOutputFormat *file_oformat;
+static AVImageFormat *image_format;
 static int frame_width  = 160;
 static int frame_height = 128;
+static float frame_aspect_ratio = 0;
+static enum PixelFormat frame_pix_fmt = PIX_FMT_YUV420P;
 static int frame_topBand  = 0;
 static int frame_bottomBand = 0;
 static int frame_leftBand  = 0;
 static int frame_rightBand = 0;
-static int frame_rate = 25 * FRAME_RATE_BASE;
+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 int video_qmin = 2;
 static int video_qmax = 31;
+static int video_mb_qmin = 2;
+static int video_mb_qmax = 31;
 static int video_qdiff = 3;
 static float video_qblur = 0.5;
 static float video_qcomp = 0.5;
+#if 0 //experimental, (can be removed)
 static float video_rc_qsquish=1.0;
 static float video_rc_qmod_amp=0;
 static int video_rc_qmod_freq=0;
+#endif
 static char *video_rc_override_string=NULL;
 static char *video_rc_eq="tex^qComp";
 static int video_rc_buffer_size=0;
@@ -106,20 +103,26 @@ static float video_b_qfactor = 1.25;
 static float video_b_qoffset = 1.25;
 static float video_i_qfactor = -0.8;
 static float video_i_qoffset = 0.0;
-static int me_method = 0;
+static int me_method = ME_EPZS;
 static int video_disable = 0;
 static int video_codec_id = CODEC_ID_NONE;
 static int same_quality = 0;
 static int b_frames = 0;
-static int use_hq = 0;
+static int mb_decision = FF_MB_DECISION_SIMPLE;
 static int use_4mv = 0;
+static int use_aic = 0;
+static int use_umv = 0;
 static int do_deinterlace = 0;
-static int workaround_bugs = 0;
-static int error_resilience = 0;
+static int workaround_bugs = FF_BUG_AUTODETECT;
+static int error_resilience = 2;
+static int error_concealment = 3;
 static int dct_algo = 0;
 static int idct_algo = 0;
 static int use_part = 0;
 static int packet_size = 0;
+static int strict = 0;
+static int debug = 0;
+extern int loop_input; /* currently a hack */
 
 static int gop_size = 12;
 static int intra_only = 0;
@@ -129,7 +132,7 @@ static int audio_disable = 0;
 static int audio_channels = 1;
 static int audio_codec_id = CODEC_ID_NONE;
 
-static INT64 recording_time = 0;
+static int64_t recording_time = 0;
 static int file_overwrite = 0;
 static char *str_title = NULL;
 static char *str_author = NULL;
@@ -137,35 +140,50 @@ static char *str_copyright = NULL;
 static char *str_comment = NULL;
 static int do_benchmark = 0;
 static int do_hex_dump = 0;
-static int do_play = 0;
 static int do_psnr = 0;
 static int do_vstats = 0;
-static int mpeg_vcd = 0;
 static int do_pass = 0;
+static int bitexact = 0;
 static char *pass_logfilename = NULL;
 static int audio_stream_copy = 0;
 static int video_stream_copy = 0;
 
-#define DEFAULT_PASS_LOGFILENAME "ffmpeg2pass"
+static int rate_emu = 0;
 
-#ifndef CONFIG_AUDIO_OSS
-const char *audio_device = "none";
-#endif
-#ifndef CONFIG_VIDEO4LINUX
-const char *v4l_device = "none";
-#endif
+static char *video_grab_format = "video4linux";
+static char *video_device = NULL;
+static int  video_channel = 0;
+static char *video_standard = "ntsc";
+
+static char *audio_grab_format = "audio_device";
+static char *audio_device = NULL;
+
+static int using_stdin = 0;
+static int using_vhook = 0;
+static int verbose = 1;
+
+#define DEFAULT_PASS_LOGFILENAME "ffmpeg2pass"
 
 typedef struct AVOutputStream {
     int file_index;          /* file index */
     int index;               /* stream index in the output file */
     int source_index;        /* AVInputStream index */
     AVStream *st;            /* stream in the output file */
-    int encoding_needed;   /* true if encoding needed for this stream */
-
+    int encoding_needed;     /* true if encoding needed for this stream */
+    int frame_number;
+    /* input pts and corresponding output pts
+       for A/V sync */
+    double sync_ipts;
+    double sync_ipts_offset;
+    int64_t sync_opts;
     /* video only */
-    AVPicture pict_tmp;         /* temporary image for resizing */
-    int video_resample;
+    int video_resample;      /* video_resample and video_crop are mutually exclusive */
+    AVPicture pict_tmp;      /* temporary image for resampling */
     ImgReSampleContext *img_resample_ctx; /* for image resampling */
+
+    int video_crop;          /* video_resample and video_crop are mutually exclusive */
+    int topBand;             /* cropping area sizes */
+    int leftBand;
     
     /* audio only */
     int audio_resample;
@@ -180,12 +198,13 @@ typedef struct AVInputStream {
     AVStream *st;
     int discard;             /* true if stream data should be discarded */
     int decoding_needed;     /* true if the packets must be decoded in 'raw_fifo' */
-    Ticker pts_ticker;       /* Ticker for PTS calculation */
-    int ticker_inited;       /* to signal if the ticker was initialized */
-    INT64 pts;               /* current pts */
-    int   pts_increment;     /* expected pts increment for next packet */
-    int frame_number;        /* current frame */
-    INT64 sample_index;      /* current sample */
+    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       pts;       /* current pts */
 } AVInputStream;
 
 typedef struct AVInputFile {
@@ -207,6 +226,15 @@ static void term_exit(void)
     tcsetattr (0, TCSANOW, &oldtty);
 }
 
+static volatile sig_atomic_t received_sigterm = 0;
+
+static void
+sigterm_handler(int sig)
+{
+    received_sigterm = sig;
+    term_exit();
+}
+
 static void term_init(void)
 {
     struct termios tty;
@@ -225,15 +253,25 @@ static void term_init(void)
     
     tcsetattr (0, TCSANOW, &tty);
 
+    signal(SIGINT , sigterm_handler); /* Interrupt (ANSI).  */
+    signal(SIGQUIT, sigterm_handler); /* Quit (POSIX).  */
+    signal(SIGTERM, sigterm_handler); /* Termination (ANSI).  */
+    /*
+    register a function to be called at normal program termination
+    */
     atexit(term_exit);
+#ifdef CONFIG_BEOS_NETSERVER
+    fcntl(0, F_SETFL, fcntl(0, F_GETFL) | O_NONBLOCK);
+#endif
 }
 
 /* read a key without blocking */
 static int read_key(void)
 {
-    struct timeval tv;
-    int n;
+    int n = 1;
     unsigned char ch;
+#ifndef CONFIG_BEOS_NETSERVER
+    struct timeval tv;
     fd_set rfds;
 
     FD_ZERO(&rfds);
@@ -241,6 +279,7 @@ static int read_key(void)
     tv.tv_sec = 0;
     tv.tv_usec = 0;
     n = select(1, &rfds, NULL, NULL, &tv);
+#endif
     if (n > 0) {
         n = read(0, &ch, 1);
         if (n == 1)
@@ -253,6 +292,8 @@ static int read_key(void)
 
 #else
 
+static volatile int received_sigterm = 0;
+
 /* no interactive support */
 static void term_exit(void)
 {
@@ -269,7 +310,7 @@ static int read_key(void)
 
 #endif
 
-int read_ffserver_streams(AVFormatContext *s, const char *filename)
+static int read_ffserver_streams(AVFormatContext *s, const char *filename)
 {
     int i, err;
     AVFormatContext *ic;
@@ -281,7 +322,8 @@ int read_ffserver_streams(AVFormatContext *s, const char *filename)
     s->nb_streams = ic->nb_streams;
     for(i=0;i<ic->nb_streams;i++) {
         AVStream *st;
-        st = av_mallocz(sizeof(AVFormatContext));
+
+        st = av_mallocz(sizeof(AVStream));
         memcpy(st, ic->streams[i], sizeof(AVStream));
         s->streams[i] = st;
     }
@@ -290,19 +332,30 @@ int read_ffserver_streams(AVFormatContext *s, const char *filename)
     return 0;
 }
 
-#define MAX_AUDIO_PACKET_SIZE 16384
+#define MAX_AUDIO_PACKET_SIZE (128 * 1024)
 
 static void do_audio_out(AVFormatContext *s, 
                          AVOutputStream *ost, 
                          AVInputStream *ist,
                          unsigned char *buf, int size)
 {
-    UINT8 *buftmp;
-    UINT8 audio_buf[2*MAX_AUDIO_PACKET_SIZE]; /* XXX: allocate it */
-    UINT8 audio_out[MAX_AUDIO_PACKET_SIZE]; /* XXX: allocate it */
+    uint8_t *buftmp;
+    static uint8_t *audio_buf = NULL;
+    static uint8_t *audio_out = NULL;
+    const int audio_out_size= 4*MAX_AUDIO_PACKET_SIZE;
+
     int size_out, frame_bytes, ret;
     AVCodecContext *enc;
 
+    /* SC: dynamic allocation of buffers */
+    if (!audio_buf)
+        audio_buf = av_malloc(2*MAX_AUDIO_PACKET_SIZE);
+    if (!audio_out)
+        audio_out = av_malloc(audio_out_size);
+    if (!audio_buf || !audio_out)
+        return;               /* Should signal an error ! */
+
+    
     enc = &ost->st->codec;
 
     if (ost->audio_resample) {
@@ -326,9 +379,9 @@ static void do_audio_out(AVFormatContext *s,
         
         while (fifo_read(&ost->fifo, audio_buf, frame_bytes, 
                      &ost->fifo.rptr) == 0) {
-            ret = avcodec_encode_audio(enc, audio_out, sizeof(audio_out)
+            ret = avcodec_encode_audio(enc, audio_out, audio_out_size
                                        (short *)audio_buf);
-            s->oformat->write_packet(s, ost->index, audio_out, ret, 0);
+            av_write_frame(s, ost->index, audio_out, ret);
         }
     } else {
         /* output a pcm frame */
@@ -344,166 +397,146 @@ static void do_audio_out(AVFormatContext *s,
             break;
         }
         ret = avcodec_encode_audio(enc, audio_out, size_out, 
-                                   (short *)buftmp);
-        s->oformat->write_packet(s, ost->index, audio_out, ret, 0);
+                                  (short *)buftmp);
+        av_write_frame(s, ost->index, audio_out, ret);
     }
 }
 
-/* write a picture to a raw mux */
-static void write_picture(AVFormatContext *s, int index, AVPicture *picture, 
-                          int pix_fmt, int w, int h)
+static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void **bufp)
 {
-    UINT8 *buf, *src, *dest;
-    int size, j, i;
+    AVCodecContext *dec;
+    AVPicture *picture2;
+    AVPicture picture_tmp;
+    uint8_t *buf = 0;
 
-    /* XXX: not efficient, should add test if we can take
-       directly the AVPicture */
-    switch(pix_fmt) {
-    case PIX_FMT_YUV420P:
-        size = avpicture_get_size(pix_fmt, w, h);
-        buf = av_malloc(size);
-        if (!buf)
-            return;
-        dest = buf;
-        for(i=0;i<3;i++) {
-            if (i == 1) {
-                w >>= 1;
-                h >>= 1;
-            }
-            src = picture->data[i];
-            for(j=0;j<h;j++) {
-                memcpy(dest, src, w);
-                dest += w;
-                src += picture->linesize[i];
-            }
-        }
-        break;
-    case PIX_FMT_YUV422P:
-        size = (w * h) * 2; 
+    dec = &ist->st->codec;
+
+    /* deinterlace : must be done before any resize */
+    if (do_deinterlace || using_vhook) {
+        int size;
+
+        /* create temporary picture */
+        size = avpicture_get_size(dec->pix_fmt, dec->width, dec->height);
         buf = av_malloc(size);
         if (!buf)
             return;
-        dest = buf;
-        for(i=0;i<3;i++) {
-            if (i == 1) {
-                w >>= 1;
-            }
-            src = picture->data[i];
-            for(j=0;j<h;j++) {
-                memcpy(dest, src, w);
-                dest += w;
-                src += picture->linesize[i];
+        
+        picture2 = &picture_tmp;
+        avpicture_fill(picture2, buf, dec->pix_fmt, dec->width, dec->height);
+
+        if (do_deinterlace){
+            if(avpicture_deinterlace(picture2, picture, 
+                                     dec->pix_fmt, dec->width, dec->height) < 0) {
+                /* if error, do not deinterlace */
+                av_free(buf);
+                buf = NULL;
+                picture2 = picture;
             }
-        }
-        break;
-    case PIX_FMT_YUV444P:
-        size = (w * h) * 3; 
-        buf = av_malloc(size);
-        if (!buf)
-            return;
-        dest = buf;
-        for(i=0;i<3;i++) {
-            src = picture->data[i];
-            for(j=0;j<h;j++) {
-                memcpy(dest, src, w);
-                dest += w;
-                src += picture->linesize[i];
+        } else {
+            if (img_convert(picture2, dec->pix_fmt, picture, 
+                            dec->pix_fmt, dec->width, dec->height) < 0) {
+                /* if error, do not copy */
+                av_free(buf);
+                buf = NULL;
+                picture2 = picture;
             }
         }
-        break;
-    case PIX_FMT_YUV422:
-        size = (w * h) * 2; 
-        buf = av_malloc(size);
-        if (!buf)
-            return;
-        dest = buf;
-        src = picture->data[0];
-        for(j=0;j<h;j++) {
-            memcpy(dest, src, w * 2);
-            dest += w * 2;
-            src += picture->linesize[0];
-        }
-        break;
-    case PIX_FMT_RGB24:
-    case PIX_FMT_BGR24:
-        size = (w * h) * 3; 
-        buf = av_malloc(size);
-        if (!buf)
-            return;
-        dest = buf;
-        src = picture->data[0];
-        for(j=0;j<h;j++) {
-            memcpy(dest, src, w * 3);
-            dest += w * 3;
-            src += picture->linesize[0];
-        }
-        break;
-    default:
-        return;
+    } else {
+        picture2 = picture;
     }
-    s->oformat->write_packet(s, index, buf, size, 0);
-    av_free(buf);
+
+    frame_hook_process(picture2, dec->pix_fmt, dec->width, dec->height);
+
+    if (picture != picture2)
+        *picture = *picture2;
+    *bufp = buf;
 }
 
+/* we begin to correct av delay at this threshold */
+#define AV_DELAY_MAX 0.100
 
 static void do_video_out(AVFormatContext *s, 
                          AVOutputStream *ost, 
                          AVInputStream *ist,
-                         AVPicture *picture1,
-                         int *frame_size)
-{
-    int n1, n2, nb, i, ret, frame_number, dec_frame_rate;
-    AVPicture *picture, *picture2, *pict;
-    AVPicture picture_tmp1, picture_tmp2;
-    static UINT8 *video_buffer;
-    UINT8 *buf = NULL, *buf1 = NULL;
+                         AVPicture *in_picture,
+                         int *frame_size, AVOutputStream *audio_sync)
+{
+    int nb_frames, i, ret;
+    AVPicture *final_picture, *formatted_picture;
+    AVPicture picture_format_temp, picture_crop_temp;
+    static uint8_t *video_buffer;
+    uint8_t *buf = NULL, *buf1 = NULL;
     AVCodecContext *enc, *dec;
+    enum PixelFormat target_pixfmt;
 
 #define VIDEO_BUFFER_SIZE (1024*1024)
 
     enc = &ost->st->codec;
     dec = &ist->st->codec;
 
-    frame_number = ist->frame_number;
-    dec_frame_rate = ist->st->r_frame_rate;
-    //    fprintf(stderr, "\n%d", dec_frame_rate);
-    /* first drop frame if needed */
-    n1 = ((INT64)frame_number * enc->frame_rate) / dec_frame_rate;
-    n2 = (((INT64)frame_number + 1) * enc->frame_rate) / dec_frame_rate;
-    nb = n2 - n1;
-    if (nb <= 0) 
-        return;
+    /* by default, we output a single frame */
+    nb_frames = 1;
 
-    if (!video_buffer)
-        video_buffer= av_malloc(VIDEO_BUFFER_SIZE);
-    if(!video_buffer) return;
+    *frame_size = 0;
 
-    /* deinterlace : must be done before any resize */
-    if (do_deinterlace) {
-        int size;
+    /* NOTE: the A/V sync is always done by considering the audio is
+       the master clock. It is suffisant for transcoding or playing,
+       but not for the general case */
+    if (audio_sync) {
+        /* compute the A-V delay and duplicate/remove frames if needed */
+        double adelta, vdelta, av_delay;
 
-        /* create temporary picture */
-        size = avpicture_get_size(dec->pix_fmt, dec->width, dec->height);
-        buf1 = av_malloc(size);
-        if (!buf1)
-            return;
-        
-        picture2 = &picture_tmp2;
-        avpicture_fill(picture2, buf1, dec->pix_fmt, dec->width, dec->height);
-
-        if (avpicture_deinterlace(picture2, picture1, 
-                                  dec->pix_fmt, dec->width, dec->height) < 0) {
-            /* if error, do not deinterlace */
-            av_free(buf1);
-            buf1 = NULL;
-            picture2 = picture1;
-        }
+        adelta = audio_sync->sync_ipts - ((double)audio_sync->sync_opts * 
+            s->pts_num / s->pts_den);
+
+        vdelta = ost->sync_ipts - ((double)ost->sync_opts *
+            s->pts_num / s->pts_den);
+
+        av_delay = adelta - vdelta;
+        //            printf("delay=%f\n", av_delay);
+        if (av_delay < -AV_DELAY_MAX)
+            nb_frames = 2;
+        else if (av_delay > AV_DELAY_MAX)
+            nb_frames = 0;
     } else {
-        picture2 = picture1;
+        double vdelta;
+
+        vdelta = (double)(ost->st->pts.val) * s->pts_num / s->pts_den - (ost->sync_ipts - ost->sync_ipts_offset);
+        if (vdelta < 100 && vdelta > -100 && ost->sync_ipts_offset) {
+            if (vdelta < -AV_DELAY_MAX)
+                nb_frames = 2;
+            else if (vdelta > AV_DELAY_MAX)
+                nb_frames = 0;
+        } else {
+            ost->sync_ipts_offset -= vdelta;
+            if (!ost->sync_ipts_offset)
+                ost->sync_ipts_offset = 0.000001; /* one microsecond */
+        }
     }
+    
+#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]);
+#endif
+
+    if (nb_frames <= 0) 
+        return;
+
+    if (!video_buffer)
+        video_buffer = av_malloc(VIDEO_BUFFER_SIZE);
+    if (!video_buffer)
+        return;
 
     /* convert pixel format if needed */
-    if (enc->pix_fmt != dec->pix_fmt) {
+    target_pixfmt = ost->video_resample ? PIX_FMT_YUV420P : enc->pix_fmt;
+    if (dec->pix_fmt != target_pixfmt) {
         int size;
 
         /* create temporary picture */
@@ -511,44 +544,90 @@ static void do_video_out(AVFormatContext *s,
         buf = av_malloc(size);
         if (!buf)
             return;
-        pict = &picture_tmp1;
-        avpicture_fill(pict, buf, enc->pix_fmt, dec->width, dec->height);
+        formatted_picture = &picture_format_temp;
+        avpicture_fill(formatted_picture, buf, enc->pix_fmt, dec->width, dec->height);
         
-        if (img_convert(pict, enc->pix_fmt, 
-                        picture2, dec->pix_fmt, 
+        if (img_convert(formatted_picture, target_pixfmt, 
+                        in_picture, dec->pix_fmt, 
                         dec->width, dec->height) < 0) {
             fprintf(stderr, "pixel format conversion not handled\n");
             goto the_end;
         }
     } else {
-        pict = picture2;
+        formatted_picture = in_picture;
     }
 
     /* XXX: resampling could be done before raw format convertion in
        some cases to go faster */
     /* XXX: only works for YUV420P */
     if (ost->video_resample) {
-        picture = &ost->pict_tmp;
-        img_resample(ost->img_resample_ctx, picture, pict);
+        final_picture = &ost->pict_tmp;
+        img_resample(ost->img_resample_ctx, final_picture, formatted_picture);
+       if (enc->pix_fmt != PIX_FMT_YUV420P) {
+            int size;
+           
+           av_free(buf);
+            /* create temporary picture */
+            size = avpicture_get_size(enc->pix_fmt, enc->width, enc->height);
+            buf = av_malloc(size);
+            if (!buf)
+                return;
+            final_picture = &picture_format_temp;
+            avpicture_fill(final_picture, buf, enc->pix_fmt, enc->width, enc->height);
+        
+            if (img_convert(final_picture, enc->pix_fmt, 
+                            &ost->pict_tmp, PIX_FMT_YUV420P, 
+                            enc->width, enc->height) < 0) {
+                fprintf(stderr, "pixel format conversion not handled\n");
+                goto the_end;
+            }
+       }
+    } else if (ost->video_crop) {
+        picture_crop_temp.data[0] = formatted_picture->data[0] +
+                (ost->topBand * formatted_picture->linesize[0]) + ost->leftBand;
+
+        picture_crop_temp.data[1] = formatted_picture->data[1] +
+                ((ost->topBand >> 1) * formatted_picture->linesize[1]) +
+                (ost->leftBand >> 1);
+
+        picture_crop_temp.data[2] = formatted_picture->data[2] +
+                ((ost->topBand >> 1) * formatted_picture->linesize[2]) +
+                (ost->leftBand >> 1);
+
+        picture_crop_temp.linesize[0] = formatted_picture->linesize[0];
+        picture_crop_temp.linesize[1] = formatted_picture->linesize[1];
+        picture_crop_temp.linesize[2] = formatted_picture->linesize[2];
+        final_picture = &picture_crop_temp;
     } else {
-        picture = pict;
+        final_picture = formatted_picture;
     }
-    nb=1;
     /* duplicates frame if needed */
     /* XXX: pb because no interleaving */
-    for(i=0;i<nb;i++) {
-        if (enc->codec_id != CODEC_ID_RAWVIDEO) {
+    for(i=0;i<nb_frames;i++) {
+        if (s->oformat->flags & AVFMT_RAWPICTURE) {
+            /* raw pictures are written as AVPicture structure to
+               avoid any copies. We support temorarily the older
+               method. */
+            av_write_frame(s, ost->index, 
+                           (uint8_t *)final_picture, sizeof(AVPicture));
+        } else {
+            AVFrame big_picture;
+            
+            memset(&big_picture, 0, sizeof(AVFrame));
+            *(AVPicture*)&big_picture= *final_picture;
+                        
             /* handles sameq here. This is not correct because it may
                not be a global option */
             if (same_quality) {
-                enc->quality = dec->quality;
-            }
+                big_picture.quality = ist->st->quality;
+            }else
+                big_picture.quality = ost->st->quality;
             
             ret = avcodec_encode_video(enc, 
                                        video_buffer, VIDEO_BUFFER_SIZE,
-                                       picture);
+                                       &big_picture);
             //enc->frame_number = enc->real_pict_num;
-            s->oformat->write_packet(s, ost->index, video_buffer, ret, 0);
+            av_write_frame(s, ost->index, video_buffer, ret);
             *frame_size = ret;
             //fprintf(stderr,"\nFrame: %3d %3d size: %5d type: %d",
             //        enc->frame_number-1, enc->real_pict_num, ret,
@@ -557,27 +636,30 @@ static void do_video_out(AVFormatContext *s,
             if (ost->logfile && enc->stats_out) {
                 fprintf(ost->logfile, "%s", enc->stats_out);
             }
-        } else {
-            write_picture(s, ost->index, picture, enc->pix_fmt, enc->width, enc->height);
         }
+        ost->frame_number++;
     }
   the_end:
+ the_end:
     av_free(buf);
     av_free(buf1);
 }
 
-static void do_video_stats(AVOutputStream *ost, 
-                         AVInputStream *ist,
-                         int frame_size)
+static double psnr(double d){
+    if(d==0) return INFINITY;
+    return -10.0*log(d)/log(10.0);
+}
+
+static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, 
+                           int frame_size)
 {
     static FILE *fvstats=NULL;
-    static INT64 total_size = 0;
+    static int64_t total_size = 0;
     char filename[40];
     time_t today2;
     struct tm *today;
     AVCodecContext *enc;
     int frame_number;
-    INT64 ti;
+    int64_t ti;
     double ti1, bitrate, avg_bitrate;
     
     if (!fvstats) {
@@ -597,29 +679,96 @@ static void do_video_stats(AVOutputStream *ost,
     enc = &ost->st->codec;
     total_size += frame_size;
     if (enc->codec_type == CODEC_TYPE_VIDEO) {
-        frame_number = ist->frame_number;
-        fprintf(fvstats, "frame= %5d q= %2d ", frame_number, enc->quality);
-        if (do_psnr)
-            fprintf(fvstats, "PSNR= %6.2f ", enc->psnr_y);
+        frame_number = ost->frame_number;
+        fprintf(fvstats, "frame= %5d q= %2.1f ", frame_number, enc->coded_frame->quality);
+        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)));
         
         fprintf(fvstats,"f_size= %6d ", frame_size);
-        /* compute min pts value */
-        if (!ist->discard && ist->pts < ti) {
-            ti = ist->pts;
-        }
-        ti1 = (double)ti / 1000000.0;
+        /* compute pts value */
+        ti1 = (double)ost->st->pts.val * os->pts_num / os->pts_den;
         if (ti1 < 0.01)
             ti1 = 0.01;
     
-        bitrate = (double)(frame_size * 8) * enc->frame_rate / FRAME_RATE_BASE / 1000.0;
+        bitrate = (double)(frame_size * 8) * enc->frame_rate / enc->frame_rate_base / 1000.0;
         avg_bitrate = (double)(total_size * 8) / ti1 / 1000.0;
         fprintf(fvstats, "s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ",
             (double)total_size / 1024, ti1, bitrate, avg_bitrate);
-        fprintf(fvstats,"type= %s\n", enc->key_frame == 1 ? "I" : "P");        
+        fprintf(fvstats,"type= %c\n", av_get_pict_type_char(enc->coded_frame->pict_type));        
     }
+}
 
+static void print_report(AVFormatContext **output_files,
+                        AVOutputStream **ost_table, int nb_ostreams,
+                        int is_last_report)
+{
+    char buf[1024];
+    AVOutputStream *ost;
+    AVFormatContext *oc, *os;
+    int64_t total_size;
+    AVCodecContext *enc;
+    int frame_number, vid, i;
+    double bitrate, ti1, pts;
+    static int64_t last_time = -1;
     
+    if (!is_last_report) {
+        int64_t cur_time;
+        /* display the report every 0.5 seconds */
+        cur_time = av_gettime();
+        if (last_time == -1) {
+            last_time = cur_time;
+            return;
+        } 
+        if ((cur_time - last_time) < 500000)
+            return;
+        last_time = cur_time;
+    }
+
+
+    oc = output_files[0];
+
+    total_size = url_ftell(&oc->pb);
     
+    buf[0] = '\0';
+    ti1 = 1e10;
+    vid = 0;
+    for(i=0;i<nb_ostreams;i++) {
+        ost = ost_table[i];
+        os = output_files[ost->file_index];
+        enc = &ost->st->codec;
+        if (vid && enc->codec_type == CODEC_TYPE_VIDEO) {
+            sprintf(buf + strlen(buf), "q=%2.1f ",
+                    enc->coded_frame->quality);
+        }
+        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)));
+            vid = 1;
+        }
+        /* compute min output value */
+        pts = (double)ost->st->pts.val * os->pts_num / os->pts_den;
+        if ((pts < ti1) && (pts > 0))
+            ti1 = pts;
+    }
+    if (ti1 < 0.01)
+        ti1 = 0.01;
+    
+    if (verbose || is_last_report) {
+        bitrate = (double)(total_size * 8) / ti1 / 1000.0;
+        
+        sprintf(buf + strlen(buf), 
+            "size=%8.0fkB time=%0.1f bitrate=%6.1fkbits/s",
+            (double)total_size / 1024, ti1, bitrate);
+        
+        fprintf(stderr, "%s    \r", buf);
+        fflush(stderr);
+    }
+        
+    if (is_last_report)
+        fprintf(stderr, "\n");
 }
 
 /*
@@ -636,7 +785,6 @@ static int av_encode(AVFormatContext **output_files,
     AVCodecContext *codec, *icodec;
     AVOutputStream *ost, **ost_table = NULL;
     AVInputStream *ist, **ist_table = NULL;
-    INT64 min_pts, start_time;
     AVInputFile *file_table;
     AVFormatContext *stream_no_data;
     int key;
@@ -675,6 +823,11 @@ static int av_encode(AVFormatContext **output_files,
             ist->index = k;
             ist->discard = 1; /* the stream is discarded by default
                                  (changed later) */
+
+            if (ist->st->codec.rate_emu) {
+                ist->start = av_gettime();
+                ist->frame = 0;
+            }
         }
     }
 
@@ -683,14 +836,24 @@ static int av_encode(AVFormatContext **output_files,
     for(i=0;i<nb_output_files;i++) {
         os = output_files[i];
         nb_ostreams += os->nb_streams;
-        if (mpeg_vcd)
-            os->flags |= AVF_FLAG_VCD;
     }
     if (nb_stream_maps > 0 && nb_stream_maps != nb_ostreams) {
         fprintf(stderr, "Number of stream maps must match number of output streams\n");
         exit(1);
     }
 
+    /* Sanity check the mapping args -- do the input files & streams exist? */
+    for(i=0;i<nb_stream_maps;i++) {
+        int fi = stream_maps[i].file_index;
+        int si = stream_maps[i].stream_index;
+        
+        if (fi < 0 || fi > nb_input_files - 1 ||
+            si < 0 || si > file_table[fi].nb_streams - 1) {
+            fprintf(stderr,"Could not find input stream #%d.%d\n", fi, si);
+            exit(1);
+        }
+    }
+    
     ost_table = av_mallocz(sizeof(AVOutputStream *) * nb_ostreams);
     if (!ost_table)
         goto fail;
@@ -713,6 +876,15 @@ static int av_encode(AVFormatContext **output_files,
             if (nb_stream_maps > 0) {
                 ost->source_index = file_table[stream_maps[n-1].file_index].ist_index + 
                     stream_maps[n-1].stream_index;
+                    
+                /* Sanity check that the stream types match */
+                if (ist_table[ost->source_index]->st->codec.codec_type != ost->st->codec.codec_type) {
+                    fprintf(stderr, "Codec type mismatch for mapping #%d.%d -> #%d.%d\n",
+                        stream_maps[n-1].file_index, stream_maps[n-1].stream_index,
+                        ost->file_index, ost->index);
+                    exit(1);
+                }
+                
             } else {
                 /* get corresponding input stream index : we select the first one with the right type */
                 found = 0;
@@ -767,6 +939,7 @@ static int av_encode(AVFormatContext **output_files,
                 break;
             case CODEC_TYPE_VIDEO:
                 codec->frame_rate = icodec->frame_rate;
+                codec->frame_rate_base = icodec->frame_rate_base;
                 codec->width = icodec->width;
                 codec->height = icodec->height;
                 break;
@@ -796,6 +969,11 @@ static int av_encode(AVFormatContext **output_files,
                             ost->resample = audio_resample_init(codec->channels, icodec->channels,
                                                         codec->sample_rate, 
                                                         icodec->sample_rate);
+                           if(!ost->resample)
+                             {
+                               printf("Can't resample.  Aborting.\n");
+                               av_abort();
+                             }
                         }
                         /* Request specific number of channels */
                         icodec->channels = codec->channels;
@@ -804,6 +982,11 @@ static int av_encode(AVFormatContext **output_files,
                         ost->resample = audio_resample_init(codec->channels, icodec->channels,
                                                         codec->sample_rate, 
                                                         icodec->sample_rate);
+                       if(!ost->resample)
+                         {
+                           printf("Can't resample.  Aborting.\n");
+                           av_abort();
+                         }
                     }
                 }
                 ist->decoding_needed = 1;
@@ -811,11 +994,27 @@ static int av_encode(AVFormatContext **output_files,
                 break;
             case CODEC_TYPE_VIDEO:
                 if (codec->width == icodec->width &&
-                    codec->height == icodec->height) {
+                    codec->height == icodec->height &&
+                    frame_topBand == 0 &&
+                    frame_bottomBand == 0 &&
+                    frame_leftBand == 0 &&
+                    frame_rightBand == 0)
+                {
+                    ost->video_resample = 0;
+                    ost->video_crop = 0;
+                } else if ((codec->width == icodec->width -
+                                (frame_leftBand + frame_rightBand)) &&
+                        (codec->height == icodec->height -
+                                (frame_topBand  + frame_bottomBand)))
+                {
                     ost->video_resample = 0;
+                    ost->video_crop = 1;
+                    ost->topBand = frame_topBand;
+                    ost->leftBand = frame_leftBand;
                 } else {
-                    UINT8 *buf;
+                    uint8_t *buf;
                     ost->video_resample = 1;
+                    ost->video_crop = 0; // cropping is handled as part of resample
                     buf = av_malloc((codec->width * codec->height * 3) / 2);
                     if (!buf)
                         goto fail;
@@ -923,8 +1122,8 @@ static int av_encode(AVFormatContext **output_files,
             AVCodec *codec;
             codec = avcodec_find_decoder(ist->st->codec.codec_id);
             if (!codec) {
-                fprintf(stderr, "Unsupported codec for input stream #%d.%d\n", 
-                        ist->file_index, ist->index);
+                fprintf(stderr, "Unsupported codec (id=%d) for input stream #%d.%d\n", 
+                        ist->st->codec.codec_id, ist->file_index, ist->index);
                 exit(1);
             }
             if (avcodec_open(&ist->st->codec, codec) < 0) {
@@ -934,14 +1133,29 @@ 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;
         }
     }
 
     /* init pts */
     for(i=0;i<nb_istreams;i++) {
         ist = ist_table[i];
+       is = input_files[ist->file_index];
         ist->pts = 0;
-        ist->frame_number = 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;
+            }
+        }
     }
     
     /* compute buffer size max (should use a complete heuristic) */
@@ -960,74 +1174,60 @@ static int av_encode(AVFormatContext **output_files,
     }
 
 #ifndef CONFIG_WIN32
-    if (!do_play) {
+    if ( !using_stdin )
         fprintf(stderr, "Press [q] to stop encoding\n");
-    } else {
-        fprintf(stderr, "Press [q] to stop playing\n");
-    }
 #endif
     term_init();
 
-    start_time = av_gettime();
-    min_pts = 0;
     stream_no_data = 0;
     key = -1;
 
-    for(;;) {
+    for(; received_sigterm == 0;) {
         int file_index, ist_index;
         AVPacket pkt;
-        UINT8 *ptr;
+        uint8_t *ptr;
         int len;
-        UINT8 *data_buf;
+        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:
         /* if 'q' pressed, exits */
-        if (key) {
+        if (!using_stdin) {
             /* read_key() returns 0 on EOF */
             key = read_key();
             if (key == 'q')
                 break;
         }
 
-        /* select the input file with the smallest pts */
+        /* select the stream that we must read now by looking at the
+           smallest output pts */
         file_index = -1;
-        min_pts = MAXINT64;
-        for(i=0;i<nb_istreams;i++) {
-            ist = ist_table[i];
-            /* For some reason, the pts_increment code breaks q estimation?!? */
-            if (!ist->discard && !file_table[ist->file_index].eof_reached && 
-                ist->pts /* + ist->pts_increment */ < min_pts && input_files[ist->file_index] != stream_no_data) {
-                min_pts = ist->pts /* + ist->pts_increment */;
+        pts_min = 1e10;
+        for(i=0;i<nb_ostreams;i++) {
+            double pts;
+            ost = ost_table[i];
+            os = output_files[ost->file_index];
+            ist = ist_table[ost->source_index];
+            pts = (double)ost->st->pts.val * os->pts_num / os->pts_den;
+            if (!file_table[ist->file_index].eof_reached && 
+                pts < pts_min) {
+                pts_min = pts;
                 file_index = ist->file_index;
             }
         }
         /* if none, if is finished */
         if (file_index < 0) {
-            if (stream_no_data) {
-#ifndef CONFIG_WIN32 /* no usleep in VisualC ? */
-#ifdef __BEOS__
-                snooze(10 * 1000); /* mmu_man */ /* in microsec */
-#elif defined(__CYGWIN__)
-                usleep(10 * 1000); 
-#else
-                struct timespec ts;
-
-                ts.tv_sec = 0;
-                ts.tv_nsec = 1000 * 1000 * 10;
-                nanosleep(&ts, 0);
-#endif
-#endif
-                stream_no_data = 0;
-                continue;
-            }
             break;
-        }    
+        }
+
         /* finish if recording time exhausted */
-        if (recording_time > 0 && min_pts >= recording_time)
+        if (recording_time > 0 && pts_min >= (recording_time / 1000000.0))
             break;
+
         /* read a packet from it and output it in the fifo */
         is = input_files[file_index];
         if (av_read_packet(is, &pkt) < 0) {
@@ -1039,6 +1239,10 @@ 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);
+        }
         /* 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)
@@ -1048,24 +1252,32 @@ static int av_encode(AVFormatContext **output_files,
         if (ist->discard)
             goto discard_packet;
 
-        if (pkt.flags & PKT_FLAG_DROPPED_FRAME)
-            ist->frame_number++;
-
-        if (do_hex_dump) {
-            printf("stream #%d, size=%d:\n", pkt.stream_index, pkt.size);
-            av_hex_dump(pkt.data, pkt.size);
-        }
-
-        //        printf("read #%d.%d size=%d\n", ist->file_index, ist->index, pkt.size);
+        // 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
@@ -1082,22 +1294,19 @@ static int av_encode(AVFormatContext **output_files,
                         len -= ret;
                         continue;
                     }
-                    data_buf = (UINT8 *)samples;
+                    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:
-                    if (ist->st->codec.codec_id == CODEC_ID_RAWVIDEO) {
-                        int size;
-
-                        size = (ist->st->codec.width * ist->st->codec.height);
-                        avpicture_fill(&picture, ptr, 
-                                     ist->st->codec.pix_fmt,
-                                     ist->st->codec.width,
-                                     ist->st->codec.height);
-                        ret = len;
-                    } else {
+                    {
+                        AVFrame big_picture;
+
                         data_size = (ist->st->codec.width * ist->st->codec.height * 3) / 2;
                         ret = avcodec_decode_video(&ist->st->codec, 
-                                                   &picture, &got_picture, ptr, len);
+                                                   &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",
@@ -1111,7 +1320,8 @@ static int av_encode(AVFormatContext **output_files,
                             len -= ret;
                             continue;
                         }
-                                  
+                        av_frac_add(&ist->next_pts, 
+                                   (uint64_t)is->pts_den * ist->st->codec.frame_rate_base);          
                     }
                     break;
                 default:
@@ -1122,178 +1332,117 @@ static int av_encode(AVFormatContext **output_files,
                 data_size = len;
                 ret = len;
             }
-            /* init tickers */
-            if (!ist->ticker_inited) {
-                switch (ist->st->codec.codec_type) {
-                case CODEC_TYPE_AUDIO:
-                    ticker_init(&ist->pts_ticker,
-                            (INT64)ist->st->codec.sample_rate,
-                            (INT64)(1000000));
-                    ist->ticker_inited = 1;
-                    break;
-                case CODEC_TYPE_VIDEO:
-                    ticker_init(&ist->pts_ticker,
-                            (INT64)ist->st->r_frame_rate,
-                            ((INT64)1000000 * FRAME_RATE_BASE));
-                    ist->ticker_inited = 1;
-                    break;
-                default:
-                    av_abort();
-                }
-            }
-            /* update pts */
-            switch(ist->st->codec.codec_type) {
-            case CODEC_TYPE_AUDIO:
-                //ist->pts = (INT64)1000000 * ist->sample_index / ist->st->codec.sample_rate;
-                ist->pts = ticker_abs(&ist->pts_ticker, ist->sample_index);
-                ist->sample_index += data_size / (2 * ist->st->codec.channels);
-                ist->pts_increment = (INT64) (data_size / (2 * ist->st->codec.channels)) * 1000000 / ist->st->codec.sample_rate;
-                break;
-            case CODEC_TYPE_VIDEO:
-                ist->frame_number++;
-                //ist->pts = ((INT64)ist->frame_number * 1000000 * FRAME_RATE_BASE) / 
-                //    ist->st->codec.frame_rate;
-                ist->pts = ticker_abs(&ist->pts_ticker, ist->frame_number);
-                ist->pts_increment = ((INT64) 1000000 * FRAME_RATE_BASE) / 
-                    ist->st->codec.frame_rate;
-                break;
-            default:
-                av_abort();
-            }
             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:
-                            do_video_out(os, ost, ist, &picture, &frame_size);
-                            if (do_vstats)
-                                do_video_stats(ost, ist, frame_size);
+                            /* 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 */
-                        os->oformat->write_packet(os, ost->index, data_buf, data_size, pkt.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:
         av_free_packet(&pkt);
         
-        /* dump report by using the first video and audio streams */
-        {
-            char buf[1024];
-            AVFormatContext *oc;
-            INT64 total_size, ti;
-            AVCodecContext *enc;
-            int frame_number, vid;
-            double bitrate, ti1;
-            static INT64 last_time;
-
-            if ((min_pts - last_time) >= 500000) {
-                last_time = min_pts;
-                
-                oc = output_files[0];
-                
-                total_size = url_ftell(&oc->pb);
-                
-                buf[0] = '\0';
-                ti = MAXINT64;
-                vid = 0;
-                for(i=0;i<nb_ostreams;i++) {
-                    ost = ost_table[i];
-                    enc = &ost->st->codec;
-                    ist = ist_table[ost->source_index];
-                    if (!vid && enc->codec_type == CODEC_TYPE_VIDEO) {
-                        frame_number = ist->frame_number;
-                        sprintf(buf + strlen(buf), "frame=%5d q=%2d ",
-                                frame_number, enc->quality);
-                        if (do_psnr)
-                            sprintf(buf + strlen(buf), "PSNR=%6.2f ", enc->psnr_y);
-                        vid = 1;
-                    }
-                    /* compute min pts value */
-                    if (!ist->discard && ist->pts < ti) {
-                        ti = ist->pts;
-                    }
-                }
-
-                ti1 = (double)ti / 1000000.0;
-                if (ti1 < 0.01)
-                    ti1 = 0.01;
-                bitrate = (double)(total_size * 8) / ti1 / 1000.0;
-
-                sprintf(buf + strlen(buf), 
-                        "size=%8.0fkB time=%0.1f bitrate=%6.1fkbits/s",
-                        (double)total_size / 1024, ti1, bitrate);
-                
-                fprintf(stderr, "%s   \r", buf);
-                fflush(stderr);
-            }
-        }
+        /* dump report by using the output first video and audio streams */
+        print_report(output_files, ost_table, nb_ostreams, 0);
     }
     term_exit();
 
     /* dump report by using the first video and audio streams */
-    {
-        char buf[1024];
-        AVFormatContext *oc;
-        INT64 total_size, ti;
-        AVCodecContext *enc;
-        int frame_number, vid;
-        double bitrate, ti1;
-
-        oc = output_files[0];
-        
-        total_size = url_ftell(&oc->pb);
-        
-        buf[0] = '\0';
-        ti = MAXINT64;
-        vid = 0;
-        for(i=0;i<nb_ostreams;i++) {
-            ost = ost_table[i];
-            enc = &ost->st->codec;
-            ist = ist_table[ost->source_index];
-            if (!vid && enc->codec_type == CODEC_TYPE_VIDEO) {
-                frame_number = ist->frame_number;
-                sprintf(buf + strlen(buf), "frame=%5d q=%2d ",
-                        frame_number, enc->quality);
-                if (do_psnr)
-                    sprintf(buf + strlen(buf), "PSNR=%6.2f ", enc->psnr_y);
-                vid = 1;
-            }
-            /* compute min pts value */
-            if (!ist->discard && ist->pts < ti) {
-                ti = ist->pts;
-            }
-        }
-        
-        ti1 = ti / 1000000.0;
-        if (ti1 < 0.01)
-            ti1 = 0.01;
-        bitrate = (double)(total_size * 8) / ti1 / 1000.0;
-        
-        sprintf(buf + strlen(buf), 
-                "size=%8.0fkB time=%0.1f bitrate=%6.1fkbits/s",
-                (double)total_size / 1024, ti1, bitrate);
-        
-        fprintf(stderr, "%s   \n", buf);
-    }
+    print_report(output_files, ost_table, nb_ostreams, 1);
+
     /* close each encoder */
     for(i=0;i<nb_ostreams;i++) {
         ost = ost_table[i];
@@ -1378,30 +1527,29 @@ int file_read(const char *filename)
 }
 #endif
 
-void show_licence(void)
+static void opt_image_format(const char *arg)
 {
-    printf(
-    "ffmpeg version " FFMPEG_VERSION "\n"
-    "Copyright (c) 2000, 2001, 2002 Fabrice Bellard\n"
-    "This library is free software; you can redistribute it and/or\n"
-    "modify it under the terms of the GNU Lesser General Public\n"
-    "License as published by the Free Software Foundation; either\n"
-    "version 2 of the License, or (at your option) any later version.\n"
-    "\n"
-    "This library is distributed in the hope that it will be useful,\n"
-    "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-    "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
-    "Lesser General Public License for more details.\n"
-    "\n"
-    "You should have received a copy of the GNU Lesser General Public\n"
-    "License along with this library; if not, write to the Free Software\n"
-    "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-    );
-    exit(1);
+    AVImageFormat *f;
+    
+    for(f = first_image_format; f != NULL; f = f->next) {
+        if (!strcmp(arg, f->name))
+            break;
+    }
+    if (!f) {
+        fprintf(stderr, "Unknown image format: '%s'\n", arg);
+        exit(1);
+    }
+    image_format = f;
 }
 
-void opt_format(const char *arg)
+static void opt_format(const char *arg)
 {
+    /* compatibility stuff for pgmyuv */
+    if (!strcmp(arg, "pgmyuv")) {
+        opt_image_format(arg);
+        arg = "image";
+    }
+
     file_iformat = av_find_input_format(arg);
     file_oformat = guess_format(arg, NULL, NULL);
     if (!file_iformat && !file_oformat) {
@@ -1410,65 +1558,87 @@ void opt_format(const char *arg)
     }
 }
 
-void opt_video_bitrate(const char *arg)
+static void opt_video_bitrate(const char *arg)
 {
     video_bit_rate = atoi(arg) * 1000;
 }
 
-void opt_video_bitrate_tolerance(const char *arg)
+static void opt_video_bitrate_tolerance(const char *arg)
 {
     video_bit_rate_tolerance = atoi(arg) * 1000;
 }
 
-void opt_video_bitrate_max(const char *arg)
+static void opt_video_bitrate_max(const char *arg)
 {
     video_rc_max_rate = atoi(arg) * 1000;
 }
 
-void opt_video_bitrate_min(const char *arg)
+static void opt_video_bitrate_min(const char *arg)
 {
     video_rc_min_rate = atoi(arg) * 1000;
 }
 
-void opt_video_buffer_size(const char *arg)
+static void opt_video_buffer_size(const char *arg)
 {
     video_rc_buffer_size = atoi(arg) * 1000;
 }
 
-void opt_video_rc_eq(char *arg)
+static void opt_video_rc_eq(char *arg)
 {
     video_rc_eq = arg;
 }
 
+static void opt_video_rc_override_string(char *arg)
+{
+    video_rc_override_string = arg;
+}
+
 
-void opt_workaround_bugs(const char *arg)
+static void opt_workaround_bugs(const char *arg)
 {
     workaround_bugs = atoi(arg);
 }
 
-void opt_dct_algo(const char *arg)
+static void opt_dct_algo(const char *arg)
 {
     dct_algo = atoi(arg);
 }
 
-void opt_idct_algo(const char *arg)
+static void opt_idct_algo(const char *arg)
 {
     idct_algo = atoi(arg);
 }
 
 
-void opt_error_resilience(const char *arg)
+static void opt_error_resilience(const char *arg)
 {
     error_resilience = atoi(arg);
 }
 
-void opt_frame_rate(const char *arg)
+static void opt_error_concealment(const char *arg)
 {
-    frame_rate = (int)(strtod(arg, 0) * FRAME_RATE_BASE);
+    error_concealment = atoi(arg);
 }
 
+static void opt_debug(const char *arg)
+{
+    debug = atoi(arg);
+}
+
+static void opt_verbose(const char *arg)
+{
+    verbose = atoi(arg);
+}
+
+static void opt_frame_rate(const char *arg)
+{
+    if (parse_frame_rate(&frame_rate, &frame_rate_base, arg) < 0) {
+        fprintf(stderr, "Incorrect frame rate\n");
+       exit(1);
+    }
+}
 
-void opt_frame_crop_top(const char *arg)
+static void opt_frame_crop_top(const char *arg)
 {
     frame_topBand = atoi(arg); 
     if (frame_topBand < 0) {
@@ -1486,7 +1656,7 @@ void opt_frame_crop_top(const char *arg)
     frame_height -= frame_topBand;
 }
 
-void opt_frame_crop_bottom(const char *arg)
+static void opt_frame_crop_bottom(const char *arg)
 {
     frame_bottomBand = atoi(arg);
     if (frame_bottomBand < 0) {
@@ -1504,7 +1674,7 @@ void opt_frame_crop_bottom(const char *arg)
     frame_height -= frame_bottomBand;
 }
 
-void opt_frame_crop_left(const char *arg)
+static void opt_frame_crop_left(const char *arg)
 {
     frame_leftBand = atoi(arg);
     if (frame_leftBand < 0) {
@@ -1522,7 +1692,7 @@ void opt_frame_crop_left(const char *arg)
     frame_width -= frame_leftBand;
 }
 
-void opt_frame_crop_right(const char *arg)
+static void opt_frame_crop_right(const char *arg)
 {
     frame_rightBand = atoi(arg);
     if (frame_rightBand < 0) {
@@ -1540,10 +1710,9 @@ void opt_frame_crop_right(const char *arg)
     frame_width -= frame_rightBand;
 }
 
-void opt_frame_size(const char *arg)
+static void opt_frame_size(const char *arg)
 {
-    parse_image_size(&frame_width, &frame_height, arg);
-    if (frame_width <= 0 || frame_height <= 0) {
+    if (parse_image_size(&frame_width, &frame_height, arg) < 0) {
         fprintf(stderr, "Incorrect frame size\n");
         exit(1);
     }
@@ -1553,12 +1722,40 @@ void opt_frame_size(const char *arg)
     }
 }
 
-void opt_gop_size(const char *arg)
+static void opt_frame_pix_fmt(const char *arg)
+{
+    frame_pix_fmt = avcodec_get_pix_fmt(arg);
+}
+
+static void opt_frame_aspect_ratio(const char *arg)
+{
+    int x = 0, y = 0;
+    double ar = 0;
+    const char *p;
+    
+    p = strchr(arg, ':');
+    if (p) {
+        x = strtol(arg, (char **)&arg, 10);
+       if (arg == p)
+           y = strtol(arg+1, (char **)&arg, 10);
+       if (x > 0 && y > 0)
+           ar = (double)x / (double)y;
+    } else
+        ar = strtod(arg, (char **)&arg);
+
+    if (!ar) {
+        fprintf(stderr, "Incorrect aspect ratio specification.\n");
+       exit(1);
+    }
+    frame_aspect_ratio = ar;
+}
+
+static void opt_gop_size(const char *arg)
 {
     gop_size = atoi(arg);
 }
 
-void opt_b_frames(const char *arg)
+static void opt_b_frames(const char *arg)
 {
     b_frames = atoi(arg);
     if (b_frames > FF_MAX_B_FRAMES) {
@@ -1570,7 +1767,12 @@ void opt_b_frames(const char *arg)
     }
 }
 
-void opt_qscale(const char *arg)
+static void opt_mb_decision(const char *arg)
+{
+    mb_decision = atoi(arg);
+}
+
+static void opt_qscale(const char *arg)
 {
     video_qscale = atoi(arg);
     if (video_qscale < 0 ||
@@ -1580,7 +1782,7 @@ void opt_qscale(const char *arg)
     }
 }
 
-void opt_qmin(const char *arg)
+static void opt_qmin(const char *arg)
 {
     video_qmin = atoi(arg);
     if (video_qmin < 0 ||
@@ -1590,7 +1792,7 @@ void opt_qmin(const char *arg)
     }
 }
 
-void opt_qmax(const char *arg)
+static void opt_qmax(const char *arg)
 {
     video_qmax = atoi(arg);
     if (video_qmax < 0 ||
@@ -1600,7 +1802,27 @@ void opt_qmax(const char *arg)
     }
 }
 
-void opt_qdiff(const char *arg)
+static void opt_mb_qmin(const char *arg)
+{
+    video_mb_qmin = atoi(arg);
+    if (video_mb_qmin < 0 ||
+        video_mb_qmin > 31) {
+        fprintf(stderr, "qmin must be >= 1 and <= 31\n");
+        exit(1);
+    }
+}
+
+static void opt_mb_qmax(const char *arg)
+{
+    video_mb_qmax = atoi(arg);
+    if (video_mb_qmax < 0 ||
+        video_mb_qmax > 31) {
+        fprintf(stderr, "qmax must be >= 1 and <= 31\n");
+        exit(1);
+    }
+}
+
+static void opt_qdiff(const char *arg)
 {
     video_qdiff = atoi(arg);
     if (video_qdiff < 0 ||
@@ -1610,64 +1832,89 @@ void opt_qdiff(const char *arg)
     }
 }
 
-void opt_qblur(const char *arg)
+static void opt_qblur(const char *arg)
 {
     video_qblur = atof(arg);
 }
 
-void opt_qcomp(const char *arg)
+static void opt_qcomp(const char *arg)
 {
     video_qcomp = atof(arg);
 }
 
-void opt_b_qfactor(const char *arg)
+static void opt_rc_initial_cplx(const char *arg)
+{
+    video_rc_initial_cplx = atof(arg);
+}
+static void opt_b_qfactor(const char *arg)
 {
     video_b_qfactor = atof(arg);
 }
-void opt_i_qfactor(const char *arg)
+static void opt_i_qfactor(const char *arg)
 {
     video_i_qfactor = atof(arg);
 }
-void opt_b_qoffset(const char *arg)
+static void opt_b_qoffset(const char *arg)
 {
     video_b_qoffset = atof(arg);
 }
-void opt_i_qoffset(const char *arg)
+static void opt_i_qoffset(const char *arg)
 {
     video_i_qoffset = atof(arg);
 }
 
-void opt_packet_size(const char *arg)
+static void opt_packet_size(const char *arg)
 {
     packet_size= atoi(arg);
 }
 
-void opt_audio_bitrate(const char *arg)
+static void opt_strict(const char *arg)
+{
+    strict= atoi(arg);
+}
+
+static void opt_audio_bitrate(const char *arg)
 {
     audio_bit_rate = atoi(arg) * 1000;
 }
 
-void opt_audio_rate(const char *arg)
+static void opt_audio_rate(const char *arg)
 {
     audio_sample_rate = atoi(arg);
 }
 
-void opt_audio_channels(const char *arg)
+static void opt_audio_channels(const char *arg)
 {
     audio_channels = atoi(arg);
 }
 
-void opt_video_device(const char *arg)
+static void opt_video_device(const char *arg)
+{
+    video_device = av_strdup(arg);
+}
+
+static void opt_video_channel(const char *arg)
 {
-    v4l_device = strdup(arg);
+    video_channel = strtol(arg, NULL, 0);
 }
 
-void opt_audio_device(const char *arg)
+static void opt_video_standard(const char *arg)
 {
-    audio_device = strdup(arg);
+    video_standard = av_strdup(arg);
 }
 
-void opt_audio_codec(const char *arg)
+static void opt_audio_device(const char *arg)
+{
+    audio_device = av_strdup(arg);
+}
+
+static void opt_dv1394(const char *arg)
+{
+    video_grab_format = "dv1394";
+    audio_grab_format = NULL;
+}
+
+static void opt_audio_codec(const char *arg)
 {
     AVCodec *p;
 
@@ -1689,6 +1936,27 @@ void opt_audio_codec(const char *arg)
     }
 }
 
+static void add_frame_hooker(const char *arg)
+{
+    int argc = 0;
+    char *argv[64];
+    int i;
+    char *args = av_strdup(arg);
+
+    using_vhook = 1;
+
+    argv[0] = strtok(args, " ");
+    while (argc < 62 && (argv[++argc] = strtok(NULL, " "))) {
+    }
+
+    i = frame_hook_add(argc, argv);
+
+    if (i != 0) {
+        fprintf(stderr, "Failed to add video hook function: %s\n", arg);
+        exit(1);
+    }
+}
+
 const char *motion_str[] = {
     "zero",
     "full",
@@ -1699,7 +1967,7 @@ const char *motion_str[] = {
     NULL,
 };
 
-void opt_motion_estimation(const char *arg)
+static void opt_motion_estimation(const char *arg)
 {
     const char **p;
     p = motion_str;
@@ -1715,7 +1983,7 @@ void opt_motion_estimation(const char *arg)
     me_method = (p - motion_str) + 1;
 }
 
-void opt_video_codec(const char *arg)
+static void opt_video_codec(const char *arg)
 {
     AVCodec *p;
 
@@ -1737,7 +2005,7 @@ void opt_video_codec(const char *arg)
     }
 }
 
-void opt_map(const char *arg)
+static void opt_map(const char *arg)
 {
     AVStreamMap *m;
     const char *p;
@@ -1752,46 +2020,33 @@ void opt_map(const char *arg)
     m->stream_index = strtol(p, (char **)&p, 0);
 }
 
-void opt_recording_time(const char *arg)
+static void opt_recording_time(const char *arg)
 {
     recording_time = parse_date(arg, 1);
 }
 
-void print_error(const char *filename, int err)
-{
-    switch(err) {
-    case AVERROR_NUMEXPECTED:
-        fprintf(stderr, "%s: Incorrect image filename syntax.\n"
-                "Use '%%d' to specify the image number:\n"
-                "  for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n"
-                "  for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n", 
-                filename);
-        break;
-    case AVERROR_INVALIDDATA:
-        fprintf(stderr, "%s: Error while parsing header\n", filename);
-        break;
-    case AVERROR_NOFMT:
-        fprintf(stderr, "%s: Unknown format\n", filename);
-        break;
-    default:
-        fprintf(stderr, "%s: Error while opening file\n", filename);
-        break;
-    }
-}
-
-void opt_input_file(const char *filename)
+static void opt_input_file(const char *filename)
 {
     AVFormatContext *ic;
     AVFormatParameters params, *ap = &params;
-    int err, i, ret, rfps;
+    int err, i, ret, rfps, rfps_base;
+
+    if (!strcmp(filename, "-"))
+        filename = "pipe:";
+
+    using_stdin |= !strcmp(filename, "pipe:" ) || 
+                   !strcmp( filename, "/dev/stdin" );
 
     /* get default parameters from command line */
     memset(ap, 0, sizeof(*ap));
     ap->sample_rate = audio_sample_rate;
     ap->channels = audio_channels;
     ap->frame_rate = frame_rate;
+    ap->frame_rate_base = frame_rate_base;
     ap->width = frame_width;
     ap->height = frame_height;
+    ap->image_format = image_format;
+    ap->pix_fmt = frame_pix_fmt;
 
     /* open the input file with generic libav function */
     err = av_open_input_file(&ic, filename, file_iformat, 0, ap);
@@ -1820,17 +2075,34 @@ void opt_input_file(const char *filename)
         case CODEC_TYPE_VIDEO:
             frame_height = enc->height;
             frame_width = enc->width;
-            rfps = ic->streams[i]->r_frame_rate;
+           frame_aspect_ratio = enc->aspect_ratio;
+           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;
-            if (enc->frame_rate != rfps) {
+            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;
+            
+            if(bitexact)
+                enc->flags|= CODEC_FLAG_BITEXACT;
+
+            assert(enc->frame_rate_base == rfps_base); // should be true for now
+            if (enc->frame_rate != rfps) { 
                 fprintf(stderr,"\nSeems that stream %d comes from film source: %2.2f->%2.2f\n",
-                    i, (float)enc->frame_rate / FRAME_RATE_BASE,
-                    (float)rfps / FRAME_RATE_BASE);
+                    i, (float)enc->frame_rate / enc->frame_rate_base,
+                    (float)rfps / rfps_base);
             }
             /* update the current frame rate to match the stream frame rate */
-            frame_rate = rfps;
+            frame_rate      = rfps;
+            frame_rate_base = rfps_base;
+
+            enc->rate_emu = rate_emu;
             break;
         default:
             av_abort();
@@ -1843,9 +2115,12 @@ void opt_input_file(const char *filename)
     nb_input_files++;
     file_iformat = NULL;
     file_oformat = NULL;
+    image_format = NULL;
+
+    rate_emu = 0;
 }
 
-void check_audio_video_inputs(int *has_video_ptr, int *has_audio_ptr)
+static void check_audio_video_inputs(int *has_video_ptr, int *has_audio_ptr)
 {
     int has_video, has_audio, i, j;
     AVFormatContext *ic;
@@ -1872,12 +2147,13 @@ void check_audio_video_inputs(int *has_video_ptr, int *has_audio_ptr)
     *has_audio_ptr = has_audio;
 }
 
-void opt_output_file(const char *filename)
+static void opt_output_file(const char *filename)
 {
     AVStream *st;
     AVFormatContext *oc;
     int use_video, use_audio, nb_streams, input_has_video, input_has_audio;
     int codec_id;
+    AVFormatParameters params, *ap = &params;
 
     if (!strcmp(filename, "-"))
         filename = "pipe:";
@@ -1934,12 +2210,19 @@ void opt_output_file(const char *filename)
                 fprintf(stderr, "Could not alloc stream\n");
                 exit(1);
             }
+            avcodec_get_context_defaults(&st->codec);
 
             video_enc = &st->codec;
+            
+            if(!strcmp(file_oformat->name, "mp4") || !strcmp(file_oformat->name, "mov") || !strcmp(file_oformat->name, "3gp"))
+                video_enc->flags |= CODEC_FLAG_GLOBAL_HEADER;
             if (video_stream_copy) {
                 st->stream_copy = 1;
                 video_enc->codec_type = CODEC_TYPE_VIDEO;
             } else {
+                char *p;
+                int i;
+            
                 codec_id = file_oformat->video_codec;
                 if (video_codec_id != CODEC_ID_NONE)
                     codec_id = video_codec_id;
@@ -1949,9 +2232,12 @@ void opt_output_file(const char *filename)
                 video_enc->bit_rate = video_bit_rate;
                 video_enc->bit_rate_tolerance = video_bit_rate_tolerance;
                 video_enc->frame_rate = frame_rate; 
+                video_enc->frame_rate_base = frame_rate_base; 
                 
                 video_enc->width = frame_width;
                 video_enc->height = frame_height;
+               video_enc->aspect_ratio = frame_aspect_ratio;
+               video_enc->pix_fmt = frame_pix_fmt;
 
                 if (!intra_only)
                     video_enc->gop_size = gop_size;
@@ -1959,15 +2245,22 @@ void opt_output_file(const char *filename)
                     video_enc->gop_size = 0;
                 if (video_qscale || same_quality) {
                     video_enc->flags |= CODEC_FLAG_QSCALE;
-                    video_enc->quality = video_qscale;
+                    st->quality = video_qscale;
                 }
-            
-                if (use_hq) {
-                    video_enc->flags |= CODEC_FLAG_HQ;
+                
+                if(bitexact)
+                    video_enc->flags |= CODEC_FLAG_BITEXACT;
+
+                video_enc->mb_decision = mb_decision;
+                
+                if (use_umv) {
+                    video_enc->flags |= CODEC_FLAG_H263P_UMV;
+                }
+               if (use_aic) {
+                    video_enc->flags |= CODEC_FLAG_H263P_AIC;
                 }
-            
                 if (use_4mv) {
-                    video_enc->flags |= CODEC_FLAG_HQ;
+                    video_enc->mb_decision = FF_MB_DECISION_BITS; //FIXME remove
                     video_enc->flags |= CODEC_FLAG_4MV;
                 }
             
@@ -1976,10 +2269,6 @@ void opt_output_file(const char *filename)
                
             
                 if (b_frames) {
-                    if (codec_id != CODEC_ID_MPEG4) {
-                        fprintf(stderr, "\nB frames encoding only supported by MPEG-4.\n");
-                        exit(1);
-                    }
                     video_enc->max_b_frames = b_frames;
                     video_enc->b_frame_strategy = 0;
                     video_enc->b_quant_factor = 2.0;
@@ -1987,29 +2276,59 @@ void opt_output_file(const char *filename)
             
                 video_enc->qmin = video_qmin;
                 video_enc->qmax = video_qmax;
+                video_enc->mb_qmin = video_mb_qmin;
+                video_enc->mb_qmax = video_mb_qmax;
                 video_enc->max_qdiff = video_qdiff;
                 video_enc->qblur = video_qblur;
                 video_enc->qcompress = video_qcomp;
                 video_enc->rc_eq = video_rc_eq;
+                video_enc->debug= debug;
+                
+                p= video_rc_override_string;
+                for(i=0; p; i++){
+                    int start, end, q;
+                    int e=sscanf(p, "%d,%d,%d", &start, &end, &q);
+                    if(e!=3){
+                        fprintf(stderr, "error parsing rc_override\n");
+                        exit(1);
+                    }
+                    video_enc->rc_override= 
+                        av_realloc(video_enc->rc_override, 
+                                   sizeof(RcOverride)*(i+1));
+                    video_enc->rc_override[i].start_frame= start;
+                    video_enc->rc_override[i].end_frame  = end;
+                    if(q>0){
+                        video_enc->rc_override[i].qscale= q;
+                        video_enc->rc_override[i].quality_factor= 1.0;
+                    }
+                    else{
+                        video_enc->rc_override[i].qscale= 0;
+                        video_enc->rc_override[i].quality_factor= -q/100.0;
+                    }
+                    p= strchr(p, '/');
+                    if(p) p++;
+                }
+                video_enc->rc_override_count=i;
+
                 video_enc->rc_max_rate = video_rc_max_rate;
                 video_enc->rc_min_rate = video_rc_min_rate;
                 video_enc->rc_buffer_size = video_rc_buffer_size;
                 video_enc->rc_buffer_aggressivity= video_rc_buffer_aggressivity;
+                video_enc->rc_initial_cplx= video_rc_initial_cplx;
                 video_enc->i_quant_factor = video_i_qfactor;
                 video_enc->b_quant_factor = video_b_qfactor;
                 video_enc->i_quant_offset = video_i_qoffset;
                 video_enc->b_quant_offset = video_b_qoffset;
                 video_enc->dct_algo = dct_algo;
                 video_enc->idct_algo = idct_algo;
+                video_enc->strict_std_compliance = strict;
                 if(packet_size){
                     video_enc->rtp_mode= 1;
                     video_enc->rtp_payload_size= packet_size;
                 }
             
                 if (do_psnr)
-                    video_enc->get_psnr = 1;
-                else
-                    video_enc->get_psnr = 0;
+                    video_enc->flags|= CODEC_FLAG_PSNR;
             
                 video_enc->me_method = me_method;
 
@@ -2021,11 +2340,6 @@ void opt_output_file(const char *filename)
                         video_enc->flags |= CODEC_FLAG_PASS2;
                     }
                 }
-            
-                /* XXX: need to find a way to set codec parameters */
-                if (oc->oformat->flags & AVFMT_RGB24) {
-                    video_enc->pix_fmt = PIX_FMT_RGB24;
-                }
             }
             oc->streams[nb_streams] = st;
             nb_streams++;
@@ -2039,6 +2353,7 @@ void opt_output_file(const char *filename)
                 fprintf(stderr, "Could not alloc stream\n");
                 exit(1);
             }
+            avcodec_get_context_defaults(&st->codec);
 
             audio_enc = &st->codec;
             audio_enc->codec_type = CODEC_TYPE_AUDIO;
@@ -2100,13 +2415,19 @@ void opt_output_file(const char *filename)
             if (url_exist(filename)) {
                 int c;
                 
-                printf("File '%s' already exists. Overwrite ? [y/N] ", filename);
-                fflush(stdout);
-                c = getchar();
-                if (toupper(c) != 'Y') {
-                    fprintf(stderr, "Not overwriting - exiting\n");
+                if ( !using_stdin ) {
+                    fprintf(stderr,"File '%s' already exists. Overwrite ? [y/N] ", filename);
+                    fflush(stderr);
+                    c = getchar();
+                    if (toupper(c) != 'Y') {
+                        fprintf(stderr, "Not overwriting - exiting\n");
+                        exit(1);
+                    }
+                               }
+                               else {
+                    fprintf(stderr,"File '%s' already exists. Exiting.\n", filename);
                     exit(1);
-                }
+                               }
             }
         }
         
@@ -2117,9 +2438,18 @@ void opt_output_file(const char *filename)
         }
     }
 
+    memset(ap, 0, sizeof(*ap));
+    ap->image_format = image_format;
+    if (av_set_parameters(oc, ap) < 0) {
+        fprintf(stderr, "%s: Invalid encoding parameters\n",
+                oc->filename);
+        exit(1);
+    }
+
     /* reset some options */
     file_oformat = NULL;
     file_iformat = NULL;
+    image_format = NULL;
     audio_disable = 0;
     video_disable = 0;
     audio_codec_id = CODEC_ID_NONE;
@@ -2129,17 +2459,19 @@ void opt_output_file(const char *filename)
 }
 
 /* prepare dummy protocols for grab */
-void prepare_grab(void)
+static void prepare_grab(void)
 {
     int has_video, has_audio, i, j;
     AVFormatContext *oc;
     AVFormatContext *ic;
+    AVFormatParameters vp1, *vp = &vp1;
     AVFormatParameters ap1, *ap = &ap1;
-
+    
     /* see if audio/video inputs are needed */
     has_video = 0;
     has_audio = 0;
     memset(ap, 0, sizeof(*ap));
+    memset(vp, 0, sizeof(*vp));
     for(j=0;j<nb_output_files;j++) {
         oc = output_files[j];
         for(i=0;i<oc->nb_streams;i++) {
@@ -2153,12 +2485,16 @@ void prepare_grab(void)
                 has_audio = 1;
                 break;
             case CODEC_TYPE_VIDEO:
-                if (enc->width > ap->width)
-                    ap->width = enc->width;
-                if (enc->height > ap->height)
-                    ap->height = enc->height;
-                if (enc->frame_rate > ap->frame_rate)
-                    ap->frame_rate = enc->frame_rate;
+                if (enc->width > vp->width)
+                    vp->width = enc->width;
+                if (enc->height > vp->height)
+                    vp->height = enc->height;
+                
+                assert(enc->frame_rate_base == DEFAULT_FRAME_RATE_BASE);
+                if (enc->frame_rate > vp->frame_rate){
+                    vp->frame_rate      = enc->frame_rate;
+                    vp->frame_rate_base = enc->frame_rate_base;
+                }
                 has_video = 1;
                 break;
             default:
@@ -2174,45 +2510,37 @@ void prepare_grab(void)
     
     if (has_video) {
         AVInputFormat *fmt1;
-        fmt1 = av_find_input_format("video_grab_device");
-        if (av_open_input_file(&ic, "", fmt1, 0, ap) < 0) {
+        fmt1 = av_find_input_format(video_grab_format);
+        vp->device  = video_device;
+        vp->channel = video_channel;
+       vp->standard = video_standard;
+        if (av_open_input_file(&ic, "", fmt1, 0, vp) < 0) {
             fprintf(stderr, "Could not find video grab device\n");
             exit(1);
         }
         /* by now video grab has one stream */
-        ic->streams[0]->r_frame_rate = ap->frame_rate;
+        ic->streams[0]->r_frame_rate      = vp->frame_rate;
+        ic->streams[0]->r_frame_rate_base = vp->frame_rate_base;
         input_files[nb_input_files] = ic;
-        dump_format(ic, nb_input_files, v4l_device, 0);
+        dump_format(ic, nb_input_files, "", 0);
         nb_input_files++;
     }
-    if (has_audio) {
+    if (has_audio && audio_grab_format) {
         AVInputFormat *fmt1;
-        fmt1 = av_find_input_format("audio_device");
+        fmt1 = av_find_input_format(audio_grab_format);
+        ap->device = audio_device;
         if (av_open_input_file(&ic, "", fmt1, 0, ap) < 0) {
             fprintf(stderr, "Could not find audio grab device\n");
             exit(1);
         }
         input_files[nb_input_files] = ic;
-        dump_format(ic, nb_input_files, audio_device, 0);
+        dump_format(ic, nb_input_files, "", 0);
         nb_input_files++;
     }
 }
 
-/* open the necessary output devices for playing */
-void prepare_play(void)
-{
-    file_iformat = NULL;
-    file_oformat = guess_format("audio_device", NULL, NULL);
-    if (!file_oformat) {
-        fprintf(stderr, "Could not find audio device\n");
-        exit(1);
-    }
-    
-    opt_output_file(audio_device);
-}
-
 /* same option as mencoder */
-void opt_pass(const char *pass_str)
+static void opt_pass(const char *pass_str)
 {
     int pass;
     pass = atoi(pass_str);
@@ -2223,50 +2551,67 @@ void opt_pass(const char *pass_str)
     do_pass = pass;
 }
 
-#ifndef CONFIG_WIN32
-INT64 getutime(void)
+#if defined(CONFIG_WIN32) || defined(CONFIG_OS2)
+static int64_t getutime(void)
+{
+  return av_gettime();
+}
+#else
+static int64_t getutime(void)
 {
     struct rusage rusage;
 
     getrusage(RUSAGE_SELF, &rusage);
     return (rusage.ru_utime.tv_sec * 1000000LL) + rusage.ru_utime.tv_usec;
 }
-#else
-INT64 getutime(void)
-{
-  return av_gettime();
-}
 #endif
 
 extern int ffm_nopts;
 
-void opt_bitexact(void)
+static void opt_bitexact(void)
 {
-    avcodec_set_bit_exact();
+    bitexact=1;
     /* disable generate of real time pts in ffm (need to be supressed anyway) */
     ffm_nopts = 1;
 }
 
-void show_formats(void)
+static void show_formats(void)
 {
     AVInputFormat *ifmt;
     AVOutputFormat *ofmt;
+    AVImageFormat *image_fmt;
     URLProtocol *up;
     AVCodec *p;
     const char **pp;
 
-    printf("File formats:\n");
-    printf("  Encoding:");
+    printf("Output audio/video file formats:");
     for(ofmt = first_oformat; ofmt != NULL; ofmt = ofmt->next) {
         printf(" %s", ofmt->name);
     }
     printf("\n");
-    printf("  Decoding:");
+
+    printf("Input audio/video file formats:");
     for(ifmt = first_iformat; ifmt != NULL; ifmt = ifmt->next) {
         printf(" %s", ifmt->name);
     }
     printf("\n");
 
+    printf("Output image formats:");
+    for(image_fmt = first_image_format; image_fmt != NULL; 
+        image_fmt = image_fmt->next) {
+        if (image_fmt->img_write)
+            printf(" %s", image_fmt->name);
+    }
+    printf("\n");
+
+    printf("Input image formats:");
+    for(image_fmt = first_image_format; image_fmt != NULL; 
+        image_fmt = image_fmt->next) {
+        if (image_fmt->img_read)
+            printf(" %s", image_fmt->name);
+    }
+    printf("\n");
+
     printf("Codecs:\n");
     printf("  Encoders:");
     for(p = first_avcodec; p != NULL; p = p->next) {
@@ -2287,7 +2632,7 @@ void show_formats(void)
         printf(" %s:", up->name);
     printf("\n");
     
-    printf("Frame size abbreviations: sqcif qcif cif 4cif\n");
+    printf("Frame size, frame rate abbreviations: ntsc pal qntsc qpal sntsc spal film ntsc-film sqcif qcif cif 4cif\n");
     printf("Motion estimation methods:");
     pp = motion_str;
     while (*pp) {
@@ -2304,53 +2649,13 @@ void show_formats(void)
     exit(1);
 }
 
-void show_help(void)
-{
-    const char *prog;
-    const OptionDef *po;
-    int i, expert;
-    
-    prog = do_play ? "ffplay" : "ffmpeg";
-
-    printf("%s version " FFMPEG_VERSION ", Copyright (c) 2000, 2001, 2002 Fabrice Bellard\n",
-           prog);
-    
-    if (!do_play) {
-        printf("usage: ffmpeg [[options] -i input_file]... {[options] outfile}...\n"
-               "Hyper fast MPEG1/MPEG4/H263/RV and AC3/MPEG audio encoder\n");
-    } else {
-        printf("usage: ffplay [options] input_file...\n"
-               "Simple audio player\n");
-    }
-           
-    printf("\n"
-           "Main options are:\n");
-    for(i=0;i<2;i++) {
-        if (i == 1)
-            printf("\nAdvanced options are:\n");
-        for(po = options; po->name != NULL; po++) {
-            char buf[64];
-            expert = (po->flags & OPT_EXPERT) != 0;
-            if (expert == i) {
-                strcpy(buf, po->name);
-                if (po->flags & HAS_ARG) {
-                    strcat(buf, " ");
-                    strcat(buf, po->argname);
-                }
-                printf("-%-17s  %s\n", buf, po->help);
-            }
-        }
-    }
-
-    exit(1);
-}
-
 const OptionDef options[] = {
-    { "L", 0, {(void*)show_licence}, "show license" },
+    /* main options */
+    { "L", 0, {(void*)show_license}, "show license" },
     { "h", 0, {(void*)show_help}, "show help" },
     { "formats", 0, {(void*)show_formats}, "show available formats, codecs, protocols, ..." },
     { "f", HAS_ARG, {(void*)opt_format}, "force format", "fmt" },
-    { "vcd", OPT_BOOL, {(void*)&mpeg_vcd}, "output Video CD MPEG-PS compliant file" },
+    { "img", HAS_ARG, {(void*)opt_image_format}, "force image format", "img_fmt" },
     { "i", HAS_ARG, {(void*)opt_input_file}, "input file name", "filename" },
     { "y", OPT_BOOL, {(void*)&file_overwrite}, "overwrite output files" },
     { "map", HAS_ARG | OPT_EXPERT, {(void*)opt_map}, "set input stream mapping", "file:stream" },
@@ -2359,140 +2664,173 @@ const OptionDef options[] = {
     { "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" },
-    { "pass", HAS_ARG, {(void*)&opt_pass}, "select the pass number (1 or 2)", "n" },
-    { "passlogfile", HAS_ARG | OPT_STRING, {(void*)&pass_logfilename}, "select two pass log file name", "file" },
-    /* video options */
-    { "b", HAS_ARG, {(void*)opt_video_bitrate}, "set video bitrate (in kbit/s)", "bitrate" },
-    { "r", HAS_ARG, {(void*)opt_frame_rate}, "set frame rate (in Hz)", "rate" },
-    { "s", HAS_ARG, {(void*)opt_frame_size}, "set frame size (WxH or abbreviation)", "size" },
-    { "croptop", HAS_ARG, {(void*)opt_frame_crop_top}, "set top crop band size (in pixels)", "size" },
-    { "cropbottom", HAS_ARG, {(void*)opt_frame_crop_bottom}, "set bottom crop band size (in pixels)", "size" },
-    { "cropleft", HAS_ARG, {(void*)opt_frame_crop_left}, "set left crop band size (in pixels)", "size" },
-    { "cropright", HAS_ARG, {(void*)opt_frame_crop_right}, "set right crop band size (in pixels)", "size" },
-    { "g", HAS_ARG | OPT_EXPERT, {(void*)opt_gop_size}, "set the group of picture size", "gop_size" },
-    { "intra", OPT_BOOL | OPT_EXPERT, {(void*)&intra_only}, "use only intra frames"},
-    { "vn", OPT_BOOL, {(void*)&video_disable}, "disable video" },
-    { "qscale", HAS_ARG | OPT_EXPERT, {(void*)opt_qscale}, "use fixed video quantiser scale (VBR)", "q" },
-    { "qmin", HAS_ARG | OPT_EXPERT, {(void*)opt_qmin}, "min video quantiser scale (VBR)", "q" },
-    { "qmax", HAS_ARG | OPT_EXPERT, {(void*)opt_qmax}, "max video quantiser scale (VBR)", "q" },
-    { "qdiff", HAS_ARG | OPT_EXPERT, {(void*)opt_qdiff}, "max difference between the quantiser scale (VBR)", "q" },
-    { "qblur", HAS_ARG | OPT_EXPERT, {(void*)opt_qblur}, "video quantiser scale blur (VBR)", "blur" },
-    { "qcomp", HAS_ARG | OPT_EXPERT, {(void*)opt_qcomp}, "video quantiser scale compression (VBR)", "compression" },
-    { "b_qfactor", HAS_ARG | OPT_EXPERT, {(void*)opt_b_qfactor}, "qp factor between p and b frames", "factor" },
-    { "i_qfactor", HAS_ARG | OPT_EXPERT, {(void*)opt_i_qfactor}, "qp factor between p and i frames", "factor" },
-    { "b_qoffset", HAS_ARG | OPT_EXPERT, {(void*)opt_b_qoffset}, "qp offset between p and b frames", "offset" },
-    { "i_qoffset", HAS_ARG | OPT_EXPERT, {(void*)opt_i_qoffset}, "qp offset between p and i frames", "offset" },
-    { "rc_eq", HAS_ARG | OPT_EXPERT, {(void*)opt_video_rc_eq}, "", "equation" },
-    { "bt", HAS_ARG, {(void*)opt_video_bitrate_tolerance}, "set video bitrate tolerance (in kbit/s)", "tolerance" },
-    { "maxrate", HAS_ARG, {(void*)opt_video_bitrate_max}, "set max video bitrate tolerance (in kbit/s)", "bitrate" },
-    { "minrate", HAS_ARG, {(void*)opt_video_bitrate_min}, "set min video bitrate tolerance (in kbit/s)", "bitrate" },
-    { "bufsize", HAS_ARG, {(void*)opt_video_buffer_size}, "set ratecontrol buffere size (in kbit)", "size" },
-    { "vd", HAS_ARG | OPT_EXPERT, {(void*)opt_video_device}, "set video grab device", "device" },
-    { "vcodec", HAS_ARG | OPT_EXPERT, {(void*)opt_video_codec}, "force video codec ('copy' to copy stream)", "codec" },
-    { "me", HAS_ARG | OPT_EXPERT, {(void*)opt_motion_estimation}, "set motion estimation method", 
-      "method" },
-    { "dct_algo", HAS_ARG | OPT_EXPERT, {(void*)opt_dct_algo}, "set dct algo",  "algo" },
-    { "idct_algo", HAS_ARG | OPT_EXPERT, {(void*)opt_idct_algo}, "set idct algo",  "algo" },
-    { "er", HAS_ARG | OPT_EXPERT, {(void*)opt_error_resilience}, "set error resilience",  "" },
-    { "bf", HAS_ARG | OPT_EXPERT, {(void*)opt_b_frames}, "use 'frames' B frames (only MPEG-4)", "frames" },
-    { "hq", OPT_BOOL | OPT_EXPERT, {(void*)&use_hq}, "activate high quality settings" },
-    { "4mv", OPT_BOOL | OPT_EXPERT, {(void*)&use_4mv}, "use four motion vector by macroblock (only MPEG-4)" },
-    { "part", OPT_BOOL | OPT_EXPERT, {(void*)&use_part}, "use data partitioning (only MPEG-4)" },
-    { "bug", HAS_ARG | OPT_EXPERT, {(void*)opt_workaround_bugs}, "workaround not auto detected encoder bugs", "param" },
-    { "ps", HAS_ARG | OPT_EXPERT, {(void*)opt_packet_size}, "packet size", "size in bits" },
-    { "sameq", OPT_BOOL, {(void*)&same_quality}, 
-      "use same video quality as source (implies VBR)" },
-    /* audio options */
-    { "ab", HAS_ARG, {(void*)opt_audio_bitrate}, "set audio bitrate (in kbit/s)", "bitrate", },
-    { "ar", HAS_ARG, {(void*)opt_audio_rate}, "set audio sampling rate (in Hz)", "rate" },
-    { "ac", HAS_ARG, {(void*)opt_audio_channels}, "set number of audio channels", "channels" },
-    { "an", OPT_BOOL, {(void*)&audio_disable}, "disable audio" },
-    { "ad", HAS_ARG | OPT_EXPERT, {(void*)opt_audio_device}, "set audio device", "device" },
-    { "acodec", HAS_ARG | OPT_EXPERT, {(void*)opt_audio_codec}, "force audio codec ('copy' to copy stream)", "codec" },
-    { "deinterlace", OPT_BOOL | OPT_EXPERT, {(void*)&do_deinterlace}, 
-      "deinterlace pictures" },
+    { "debug", HAS_ARG | OPT_EXPERT, {(void*)opt_debug}, "print specific debug info", "" },
     { "benchmark", OPT_BOOL | OPT_EXPERT, {(void*)&do_benchmark}, 
       "add timings for benchmarking" },
     { "hex", OPT_BOOL | OPT_EXPERT, {(void*)&do_hex_dump}, 
       "dump each input packet" },
-    { "psnr", OPT_BOOL | OPT_EXPERT, {(void*)&do_psnr}, "calculate PSNR of compressed frames" },
-    { "vstats", OPT_BOOL | OPT_EXPERT, {(void*)&do_vstats}, "dump video coding statistics to file" }, 
     { "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" },
+
+    /* video options */
+    { "b", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate}, "set video bitrate (in kbit/s)", "bitrate" },
+    { "r", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_rate}, "set frame rate (Hz value, fraction or abbreviation)", "rate" },
+    { "s", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_size}, "set frame size (WxH or abbreviation)", "size" },
+    { "aspect", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_aspect_ratio}, "set aspect ratio (4:3, 16:9 or 1.3333, 1.7777)", "aspect" },
+    { "pix_fmt", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_frame_pix_fmt}, "set pixel format", "format" },
+    { "croptop", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop_top}, "set top crop band size (in pixels)", "size" },
+    { "cropbottom", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop_bottom}, "set bottom crop band size (in pixels)", "size" },
+    { "cropleft", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop_left}, "set left crop band size (in pixels)", "size" },
+    { "cropright", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop_right}, "set right crop band size (in pixels)", "size" },
+    { "g", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_gop_size}, "set the group of picture size", "gop_size" },
+    { "intra", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&intra_only}, "use only intra frames"},
+    { "vn", OPT_BOOL | OPT_VIDEO, {(void*)&video_disable}, "disable video" },
+    { "qscale", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qscale}, "use fixed video quantiser scale (VBR)", "q" },
+    { "qmin", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qmin}, "min video quantiser scale (VBR)", "q" },
+    { "qmax", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qmax}, "max video quantiser scale (VBR)", "q" },
+    { "mbqmin", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_qmin}, "min macroblock quantiser scale (VBR)", "q" },
+    { "mbqmax", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_qmax}, "max macroblock quantiser scale (VBR)", "q" },
+    { "qdiff", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qdiff}, "max difference between the quantiser scale (VBR)", "q" },
+    { "qblur", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qblur}, "video quantiser scale blur (VBR)", "blur" },
+    { "qcomp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qcomp}, "video quantiser scale compression (VBR)", "compression" },
+    { "rc_init_cplx", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_rc_initial_cplx}, "initial complexity for 1-pass encoding", "complexity" },
+    { "b_qfactor", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_b_qfactor}, "qp factor between p and b frames", "factor" },
+    { "i_qfactor", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_i_qfactor}, "qp factor between p and i frames", "factor" },
+    { "b_qoffset", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_b_qoffset}, "qp offset between p and b frames", "offset" },
+    { "i_qoffset", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_i_qoffset}, "qp offset between p and i frames", "offset" },
+//    { "b_strategy", HAS_ARG | OPT_EXPERT, {(void*)opt_b_strategy}, "dynamic b frame selection strategy", "strategy" },
+    { "rc_eq", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_video_rc_eq}, "set rate control equation", "equation" },
+    { "rc_override", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_video_rc_override_string}, "rate control override for specific intervals", "override" },
+    { "bt", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate_tolerance}, "set video bitrate tolerance (in kbit/s)", "tolerance" },
+    { "maxrate", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate_max}, "set max video bitrate tolerance (in kbit/s)", "bitrate" },
+    { "minrate", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate_min}, "set min video bitrate tolerance (in kbit/s)", "bitrate" },
+    { "bufsize", HAS_ARG | OPT_VIDEO, {(void*)opt_video_buffer_size}, "set ratecontrol buffere size (in kbit)", "size" },
+    { "vcodec", HAS_ARG | OPT_VIDEO, {(void*)opt_video_codec}, "force video codec ('copy' to copy stream)", "codec" },
+    { "me", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_motion_estimation}, "set motion estimation method", 
+      "method" },
+    { "dct_algo", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_dct_algo}, "set dct algo",  "algo" },
+    { "idct_algo", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_idct_algo}, "set idct algo",  "algo" },
+    { "er", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_error_resilience}, "set error resilience",  "n" },
+    { "ec", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_error_concealment}, "set error concealment",  "bit_mask" },
+    { "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)" },
+    { "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" },
+    { "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)" },
+    { "pass", HAS_ARG | OPT_VIDEO, {(void*)&opt_pass}, "select the pass number (1 or 2)", "n" },
+    { "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" },
+    { "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+)" },
+    { "umv", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_umv}, "enable Unlimited Motion Vector (h263+)" },
+
+    /* audio options */
+    { "ab", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_bitrate}, "set audio bitrate (in kbit/s)", "bitrate", },
+    { "ar", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_rate}, "set audio sampling rate (in Hz)", "rate" },
+    { "ac", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_channels}, "set number of audio channels", "channels" },
+    { "an", OPT_BOOL | OPT_AUDIO, {(void*)&audio_disable}, "disable audio" },
+    { "acodec", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_codec}, "force audio codec ('copy' to copy stream)", "codec" },
+
+    /* grab options */
+    { "vd", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_GRAB, {(void*)opt_video_device}, "set video grab device", "device" },
+    { "vc", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_GRAB, {(void*)opt_video_channel}, "set video grab channel (DV1394 only)", "channel" },
+    { "tvstd", HAS_ARG | OPT_EXPERT | OPT_VIDEO | OPT_GRAB, {(void*)opt_video_standard}, "set television standard (NTSC, PAL (SECAM))", "standard" },
+    { "dv1394", OPT_EXPERT | OPT_GRAB, {(void*)opt_dv1394}, "set DV1394 grab", "" },
+    { "ad", HAS_ARG | OPT_EXPERT | OPT_AUDIO | OPT_GRAB, {(void*)opt_audio_device}, "set audio device", "device" },
     { NULL, },
 };
 
+static void show_banner(void)
+{
+    printf("ffmpeg version " FFMPEG_VERSION ", Copyright (c) 2000-2003 Fabrice Bellard\n");
+}
+
+static void show_license(void)
+{
+    show_banner();
+    printf(
+    "This library is free software; you can redistribute it and/or\n"
+    "modify it under the terms of the GNU Lesser General Public\n"
+    "License as published by the Free Software Foundation; either\n"
+    "version 2 of the License, or (at your option) any later version.\n"
+    "\n"
+    "This library is distributed in the hope that it will be useful,\n"
+    "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+    "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
+    "Lesser General Public License for more details.\n"
+    "\n"
+    "You should have received a copy of the GNU Lesser General Public\n"
+    "License along with this library; if not, write to the Free Software\n"
+    "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
+    );
+    exit(1);
+}
+
+static void show_help(void)
+{
+    show_banner();
+    printf("usage: ffmpeg [[options] -i input_file]... {[options] outfile}...\n"
+           "Hyper fast Audio and Video encoder\n");
+    printf("\n");
+    show_help_options(options, "Main options:\n",
+                      OPT_EXPERT | OPT_AUDIO | OPT_VIDEO, 0);
+    show_help_options(options, "\nVideo options:\n",
+                      OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, 
+                      OPT_VIDEO);
+    show_help_options(options, "\nAdvanced Video options:\n",
+                      OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, 
+                      OPT_VIDEO | OPT_EXPERT);
+    show_help_options(options, "\nAudio options:\n",
+                      OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, 
+                      OPT_AUDIO);
+    show_help_options(options, "\nAdvanced Audio options:\n",
+                      OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, 
+                      OPT_AUDIO | OPT_EXPERT);
+    show_help_options(options, "\nAudio/Video grab options:\n",
+                      OPT_GRAB, 
+                      OPT_GRAB);
+    show_help_options(options, "\nAdvanced options:\n",
+                      OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_GRAB, 
+                      OPT_EXPERT);
+    exit(1);
+}
+
+void parse_arg_file(const char *filename)
+{
+    opt_output_file(filename);
+}
+
 int main(int argc, char **argv)
 {
-    int optindex, i;
-    const char *opt, *arg;
-    const OptionDef *po;
-    INT64 ti;
-    
-    av_register_all();
+    int i;
+    int64_t ti;
 
-    /* detect if invoked as player */
-    i = strlen(argv[0]);
-    if (i >= 6 && !strcmp(argv[0] + i - 6, "ffplay"))
-        do_play = 1;
+    av_register_all();
 
     if (argc <= 1)
         show_help();
     
     /* parse options */
-    optindex = 1;
-    while (optindex < argc) {
-        opt = argv[optindex++];
-        
-        if (opt[0] == '-' && opt[1] != '\0') {
-            po = options;
-            while (po->name != NULL) {
-                if (!strcmp(opt + 1, po->name))
-                    break;
-                po++;
-            }
-            if (!po->name) {
-                fprintf(stderr, "%s: unrecognized option '%s'\n", argv[0], opt);
-                exit(1);
-            }
-            arg = NULL;
-            if (po->flags & HAS_ARG)
-                arg = argv[optindex++];
-            if (po->flags & OPT_STRING) {
-                char *str;
-                str = strdup(arg);
-                *po->u.str_arg = str;
-            } else if (po->flags & OPT_BOOL) {
-                *po->u.int_arg = 1;
-            } else {
-                po->u.func_arg(arg);
-            }
-        } else {
-            if (!do_play) {
-                opt_output_file(opt);
-            } else {
-                opt_input_file(opt);
-            }
-        }
-    }
+    parse_options(argc, argv, options);
 
-
-    if (!do_play) {
-        /* file converter / grab */
-        if (nb_output_files <= 0) {
-            fprintf(stderr, "Must supply at least one output file\n");
-            exit(1);
-        }
-        
-        if (nb_input_files == 0) {
-            prepare_grab();
-        }
-    } else {
-        /* player */
-        if (nb_input_files <= 0) {
-            fprintf(stderr, "Must supply at least one input file\n");
-            exit(1);
-        }
-        prepare_play();
+    /* file converter / grab */
+    if (nb_output_files <= 0) {
+        fprintf(stderr, "Must supply at least one output file\n");
+        exit(1);
+    }
+    
+    if (nb_input_files == 0) {
+        prepare_grab();
     }
 
     ti = getutime();
@@ -2505,11 +2843,34 @@ int main(int argc, char **argv)
 
     /* close files */
     for(i=0;i<nb_output_files;i++) {
-        if (!(output_files[i]->oformat->flags & AVFMT_NOFILE)) 
-            url_fclose(&output_files[i]->pb);
+        /* maybe av_close_output_file ??? */
+        AVFormatContext *s = output_files[i];
+       int j;
+        if (!(s->oformat->flags & AVFMT_NOFILE))
+           url_fclose(&s->pb);
+       for(j=0;j<s->nb_streams;j++)
+           av_free(s->streams[j]);
+        av_free(s);
     }
     for(i=0;i<nb_input_files;i++)
         av_close_input_file(input_files[i]);
 
+    av_free_static();
+
+    
+#ifdef POWERPC_PERFORMANCE_REPORT
+    extern void powerpc_display_perf_report(void);
+    powerpc_display_perf_report();
+#endif /* POWERPC_PERFORMANCE_REPORT */
+
+#ifndef CONFIG_WIN32
+    if (received_sigterm) {
+        fprintf(stderr,
+            "Received signal %d: terminating.\n",
+            (int) received_sigterm);
+        exit (255);
+    }
+#endif
+    exit(0); /* not all OS-es handle main() return value */
     return 0;
 }