Merge commit '3f3232a371cc88696184d9aef1f812656264e56c'

* commit '3f3232a371cc88696184d9aef1f812656264e56c':
  avconv: set the output stream timebase

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg.c

@@ -2878,6 +2878,8 @@ static int transcode_init(void)
             exit_program(1);
         }
         ost->st->codec->codec= ost->enc_ctx->codec;
+
+        ost->st->time_base = ost->enc_ctx->time_base;
     }
 
     /* init input streams */