Merge commit '4be292dac7e7f0586053fcced8d530ccf4ebef29'

* commit '4be292dac7e7f0586053fcced8d530ccf4ebef29': atrac: Move doxygen comments to the header Conflicts: libavcodec/atrac.c libavcodec/atrac.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 16bb8faac6
parent c2df95978b 4be292dac7
commit 16bb8faac6
2 changed files with 2 additions and 2 deletions
--- a/libavcodec/atrac.c
+++ b/libavcodec/atrac.c
@ -1,5 +1,5 @@
 /*
- * Common functions for the ATRAC family of decoders
+ * common functions for the ATRAC family of decoders
 *
 * Copyright (c) 2006-2013 Maxim Poliakovski
 * Copyright (c) 2006-2008 Benjamin Larsson
--- a/libavcodec/atrac.h
+++ b/libavcodec/atrac.h
@ -1,5 +1,5 @@
 /*
- * Common functions for the ATRAC family of decoders
+ * common functions for the ATRAC family of decoders
 *
 * Copyright (c) 2009-2013 Maxim Poliakovski
 * Copyright (c) 2009 Benjamin Larsson