Merge commit '371df9ba71393a1c5429d5f40c76348b30e556c7'
authorMatthieu Bouron <matthieu.bouron@stupeflix.com>
Thu, 23 Jun 2016 15:43:19 +0000 (17:43 +0200)
committerMatthieu Bouron <matthieu.bouron@stupeflix.com>
Thu, 23 Jun 2016 15:43:19 +0000 (17:43 +0200)
* commit '371df9ba71393a1c5429d5f40c76348b30e556c7':
  flvenc: Provide output bytestream markers

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
1  2 
libavformat/flvenc.c

   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
 +#include "libavutil/intreadwrite.h"
  #include "libavutil/dict.h"
  #include "libavutil/intfloat.h"
 +#include "libavutil/avassert.h"
+ #include "libavutil/mathematics.h"
  #include "avc.h"
  #include "avformat.h"
  #include "flv.h"