[FFmpeg-cvslog] Merge commit '0d6fa3977b016f1b72b0b24b8834ff9222498548'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug  3 09:01:48 2013 +0200| [8e970a58614fe15565d5849c933f17b9ec138647] | committer: Michael Niedermayer

Merge commit '0d6fa3977b016f1b72b0b24b8834ff9222498548'

* commit '0d6fa3977b016f1b72b0b24b8834ff9222498548':
  rtmp: Add seek support

Conflicts:
	Changelog
	libavformat/version.h

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

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