[FFmpeg-cvslog] Merge commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul  3 13:38:28 2014 +0200| [44f079b27e8141c3871327c81d054777413fa49a] | committer: Michael Niedermayer

Merge commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b'

* commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b':
  lavf: document av_dump_format()

Conflicts:
	libavformat/avformat.h

See: 61f96be08a66e74897406fd64da4e61ea4b6a8c5
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44f079b27e8141c3871327c81d054777413fa49a
---