Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Jul 2013 09:48:05 +0000 (11:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Jul 2013 09:48:05 +0000 (11:48 +0200)
commitb9d55a07f3cd0dc3013d47d819c4102bd64111b1
tree05132c89a1c79ec016868b6126c81cf140d76869
parentb7ce510003275460a9b02361a8c98bfec6fa2945
parentf5e646a00ac21e500dae4bcceded790a0fbc5246
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@gmx.at>
libavformat/wtvdec.c