ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Sep 26
22:27:37 2014 +0200| [7618d360ca0b5c50c9893e45f7b0b3575ee9ccfc] | committer:
Michael Niedermayer
Merge commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6'
* commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6':
flac: Remove unused headers
Conflicts:
libavcodec/flacdec.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7618d360ca0b5c50c9893e45f7b0b3575ee9ccfc
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
