[FFmpeg-cvslog] Merge commit '139f352daf84e005824562e0e0f36e06ac60ee36' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sat Sep 14 10:26:56 2013 +0200| [d06dda65b499458761d23d9580fdcaa451ba96f5] | committer: Michael Niedermayer

Merge commit '139f352daf84e005824562e0e0f36e06ac60ee36' into release/0.10

* commit '139f352daf84e005824562e0e0f36e06ac60ee36':
  wtv: Mark attachment with a negative stream id
  avidec: Let the inner dv demuxer take care of discarding

Conflicts:
	libavformat/wtv.c

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

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