zencoder · cyriltata · Mar 11, 2014 · Mar 11, 2014 · Mar 11, 2014 · Mar 11, 2014
diff --git a/README.md b/README.md
@@ -66,6 +66,7 @@ Once you have created the object, you can use it to interact with the API. For f
 see the Documentation folder, but here is a quick overview of some of the functions that can be
 called:

+<<<<<<< HEAD
 ```php
 $zencoder->accounts->create($array);
 $zencoder->jobs->create($array);
@@ -74,6 +75,17 @@ $zencoder->inputs->details($input_id);
 $zencoder->outputs->details($output_id);
 $zencoder->notifications->parseIncoming();
 ```
+=======
+    $zencoder->accounts->create($array);
+    $zencoder->jobs->create($array);
+    $zencoder->jobs->progress($job_id);
+    $zencoder->inputs->details($input_id);
+    $zencoder->outputs->details($output_id);
+    $zencoder->notifications->parseIncoming();
+    $zencoder->reports->vod($array);
+    $zencoder->reports->live($array);
+    $zencoder->reports->all($array);
+>>>>>>> 237615a70bdc699185d4abd8d2ce2f9743284bce

 Any errors will throw a Services_Zencoder_Exception. You can call getErrors() on an exception
 and it will return any errors received from the Zencoder API.
-Original file line number
+Diff line change
@@ -66,6 +66,7 @@ Once you have created the object, you can use it to interact with the API. For f
     see the Documentation folder, but here is a quick overview of some of the functions that can be
     called:
+    <<<<<<< HEAD
     ```php
     $zencoder->accounts->create($array);
     $zencoder->jobs->create($array);
@@ -74,6 +75,17 @@ $zencoder->inputs->details($input_id);
     $zencoder->outputs->details($output_id);
     $zencoder->notifications->parseIncoming();
     ```
+    =======
+        $zencoder->accounts->create($array);
+        $zencoder->jobs->create($array);
+        $zencoder->jobs->progress($job_id);
+        $zencoder->inputs->details($input_id);
+        $zencoder->outputs->details($output_id);
+        $zencoder->notifications->parseIncoming();
+        $zencoder->reports->vod($array);
             Copy link

  
      
    
  

  
      

  
    Contributor


      

  

  
    
      

      
            chriswarren
  

      

      

      


        Mar 11, 2014


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Looks like support for live reports is in this request - can you add a line for that here?
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    

    



  
        
  
    
        
    
  


      
          
  
      
            Copy link

  
      
    
  

  
      



      

  Author


  

  
    
      

      
            cyriltata
  

      

      

      


        Mar 12, 2014


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      added
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
+        $zencoder->reports->live($array);
+        $zencoder->reports->all($array);
+    >>>>>>> 237615a70bdc699185d4abd8d2ce2f9743284bce
     Any errors will throw a Services_Zencoder_Exception. You can call getErrors() on an exception
     and it will return any errors received from the Zencoder API.
-          Expand Down