github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-25 19:33:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
7652b176fcb36fe1fc5b052d30696a829012dd29
FFmpeg/libavcodec/dca_parser.c
Michael Niedermayer 7d43fbe3ae Merge commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce' 
* commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce':
  dca: K&R formatting cosmetics

Conflicts:
	libavcodec/dca_parser.c
	libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-16 20:31:02 +02:00

5.2 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink