Merge commit '4be292da'

* commit '4be292da':
  atrac: Move doxygen comments to the header

Conflicts:
	libavcodec/atrac.c
	libavcodec/atrac.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/atrac.c

 /*
- * 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

libavcodec/atrac.h

 /*
- * 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