[FFmpeg-cvslog] Merge commit 'ae0f316a4778e473d407cffa8392595ba0735153'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 19 13:02:54 2013 +0200| [374a2f4562117a4fb1c381e756f2ef0a068b1542] | committer: Michael Niedermayer

Merge commit 'ae0f316a4778e473d407cffa8392595ba0735153'

* commit 'ae0f316a4778e473d407cffa8392595ba0735153':
  rtmp: Unbreak handle_notify

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

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