Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Apr 2012 21:44:56 +0000 (23:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Apr 2012 21:45:09 +0000 (23:45 +0200)
commit8f899545502c287653223ca27522c4abcd3a2e91
tree1b633d81c6104786d65ef05c6da1426bbead30e1
parentfe5bc46f60c0ebd82593999520ebff1d230b0483
parent8c4022aceb68558df655059cef4d570625dc1d09
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@gmx.at>
ffmpeg.c
libavformat/isom.c