Merge commit '711aa2a82727907f778fb8aa9a93aff2120170f2'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Jun 2014 10:54:36 +0000 (12:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Jun 2014 10:54:36 +0000 (12:54 +0200)
* commit '711aa2a82727907f778fb8aa9a93aff2120170f2':
  lavf: dump stream side data when probing

Conflicts:
libavformat/dump.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/dump.c

  #include <stdio.h>
  #include <stdint.h>
  
+ #include "libavutil/channel_layout.h"
+ #include "libavutil/display.h"
+ #include "libavutil/intreadwrite.h"
  #include "libavutil/log.h"
  #include "libavutil/mathematics.h"
 +#include "libavutil/avstring.h"
+ #include "libavutil/replaygain.h"
  
  #include "avformat.h"