Merge commit '0670acc4f1c4ceb16968818a654e07a3f550a8c9'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 May 2015 10:06:35 +0000 (12:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 May 2015 10:07:19 +0000 (12:07 +0200)
* commit '0670acc4f1c4ceb16968818a654e07a3f550a8c9':
  dca_parser: Extend DTS core sync word and fix existing check

Conflicts:
libavcodec/dca_parser.c

See: e80b2b9c81716a5d9f559c04cfe69d76b04e4cd3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/dca_parser.c

Simple merge