[FFmpeg-cvslog] Merge commit '44b17d794aa508ae21f438ae80bfe8aaf4b426e1'
Michael Niedermayer
git at videolan.org
Fri Nov 29 03:48:53 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 29 01:53:58 2013 +0100| [43ec456320d03d34d37f9458b0134d8f9d1ed310] | committer: Michael Niedermayer
Merge commit '44b17d794aa508ae21f438ae80bfe8aaf4b426e1'
* commit '44b17d794aa508ae21f438ae80bfe8aaf4b426e1':
dca: extract core substream's embedded downmix coeffcient codes, if present.
Conflicts:
libavcodec/dcadata.h
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=43ec456320d03d34d37f9458b0134d8f9d1ed310
---
More information about the ffmpeg-cvslog
mailing list