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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 24 23:44:56 2012 +0200| [8f899545502c287653223ca27522c4abcd3a2e91] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: fix a segfault on -c copy with -filter_complex.
  isom: Support more DTS codec identifiers.

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

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