[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul  7 11:48:05 2013 +0200| [b9d55a07f3cd0dc3013d47d819c4102bd64111b1] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wtv: Mark attachment with a negative stream id

Conflicts:
	libavformat/wtv.c

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

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