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)
* 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>
1  2 
ffmpeg.c
libavformat/isom.c

diff --cc ffmpeg.c
Simple merge
Simple merge