Merge commit '0d6fa3977b016f1b72b0b24b8834ff9222498548'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Aug 2013 07:01:48 +0000 (09:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Aug 2013 07:01:48 +0000 (09:01 +0200)
commit8e970a58614fe15565d5849c933f17b9ec138647
treefa7091a33ffeaa1be11ee6ebb4f89c75de2d625f
parent7cd13f618c3cf47c21ec8128ed61f16a14c349ef
parent0d6fa3977b016f1b72b0b24b8834ff9222498548
Merge commit '0d6fa3977b016f1b72b0b24b8834ff9222498548'

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

Conflicts:
Changelog
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavformat/rtmpproto.c
libavformat/version.h