Merge commit '139f352daf84e005824562e0e0f36e06ac60ee36' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Sep 2013 08:26:56 +0000 (10:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Sep 2013 08:26:56 +0000 (10:26 +0200)
commitd06dda65b499458761d23d9580fdcaa451ba96f5
treebfcbed6d5b9353d2941b6182f30ce6416f95d90e
parentf4392277b02e9cb991ef8ffc618c0019661a4573
parent139f352daf84e005824562e0e0f36e06ac60ee36
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@gmx.at>
libavformat/avidec.c
libavformat/wtvdec.c