ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue May 12 
12:06:35 2015 +0200| [85bbe1dbd1cc2e72ea30958af9115b727e958b99] | committer: 
Michael Niedermayer

Merge commit '0670acc4f1c4ceb16968818a654e07a3f550a8c9'

* commit '0670acc4f1c4ceb16968818a654e07a3f550a8c9':
  dca_parser: Extend DTS core sync word and fix existing check

Conflicts:
        libavcodec/dca_parser.c

See: e80b2b9c81716a5d9f559c04cfe69d76b04e4cd3
Merged-by: Michael Niedermayer <michae...@gmx.at>

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



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to