aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-03 21:22:55 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-03 21:22:55 +0200
commit16bb8faac6d51e342b64974ceb2f8edd7955f9fa (patch)
treeb97eda9819e39c14da334f1cf99b44eadb055319
parentc2df95978b19d0d4b625c23a05f4bf78e8397d0b (diff)
parent4be292dac7e7f0586053fcced8d530ccf4ebef29 (diff)
downloadffmpeg-16bb8faac6d51e342b64974ceb2f8edd7955f9fa.tar.gz
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>
-rw-r--r--libavcodec/atrac.c2
-rw-r--r--libavcodec/atrac.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/atrac.c b/libavcodec/atrac.c
index 141248f54d..f960ffc594 100644
--- 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
diff --git a/libavcodec/atrac.h b/libavcodec/atrac.h
index e47d4ca18d..c389256723 100644
--- 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