RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2013-10-03 21:22:55 +02:00
parent c2df95978b 4be292dac7
commit 16bb8faac6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/atrac.c
View File

@ -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

2
libavcodec/atrac.h
View File

@ -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