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)
commitf0fbd9105bc1edbd40fc06246aded92a9a6a5d3a
tree84fe42f126248dfd51b491e63d617a5d028376df
parent7b7afaf849efcc8dc68eea09d3e6ab03dbb68acf
parent711aa2a82727907f778fb8aa9a93aff2120170f2
Merge commit '711aa2a82727907f778fb8aa9a93aff2120170f2'

* commit '711aa2a82727907f778fb8aa9a93aff2120170f2':
  lavf: dump stream side data when probing

Conflicts:
libavformat/dump.c

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