falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

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>
tags/n2.1
Michael Niedermayer 12 years ago
parent
c2df95978b 4be292dac7
commit
16bb8faac6
2 changed files with 2 additions and 2 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      libavcodec/atrac.c
  2. +1
    -1
      libavcodec/atrac.h

+ 1
- 1
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


+ 1
- 1
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


Write Preview
Loading…
Cancel
Save