ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Wed Mar 4
19:24:12 2015 +0100| [87db7e777262a7800cc6c76e07870f7a8f6301ed] | committer:
Michael Niedermayer
Merge commit '25f613f8be3b51e4396b93cda131e4631ba54302'
* commit '25f613f8be3b51e4396b93cda131e4631ba54302':
dca: Move syncword definitions to a separate header
Conflicts:
libavcodec/dca_parser.c
libavformat/dtsdec.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=87db7e777262a7800cc6c76e07870f7a8f6301ed
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
