aboutsummaryrefslogtreecommitdiffstats
path: root/libavresample/avresample.h
diff options
context:
space:
mode:
authorThilo Borgmann <thilo.borgmann@googlemail.com>2013-08-15 23:12:51 +0200
committerPaul B Mahol <onemda@gmail.com>2013-08-30 15:47:38 +0000
commitd814a839ac117b480009cda9b50bccf7ea0f2f62 (patch)
tree34d73d1fdadbda240d51ae3958f2a9b61fa0ce3b /libavresample/avresample.h
parent8fe1fb41ac285a7867fa07c3b9cfe646737a9595 (diff)
downloadffmpeg-d814a839ac117b480009cda9b50bccf7ea0f2f62.tar.gz
Reinstate proper FFmpeg license for all files.
Diffstat (limited to 'libavresample/avresample.h')
-rw-r--r--libavresample/avresample.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavresample/avresample.h b/libavresample/avresample.h
index d26f2ca223..f62e53303d 100644
--- a/libavresample/avresample.h
+++ b/libavresample/avresample.h
@@ -1,20 +1,20 @@
/*
* Copyright (c) 2012 Justin Ruggles <justin.ruggles@gmail.com>
*
- * This file is part of Libav.
+ * This file is part of FFmpeg.
*
- * Libav is free software; you can redistribute it and/or
+ * FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
@@ -272,7 +272,7 @@ int avresample_set_matrix(AVAudioResampleContext *avr, const double *matrix,
*
* Examples:
*
- * Reordering 5.1 AAC order (C,L,R,Ls,Rs,LFE) to Libav order (L,R,C,LFE,Ls,Rs):
+ * Reordering 5.1 AAC order (C,L,R,Ls,Rs,LFE) to FFmpeg order (L,R,C,LFE,Ls,Rs):
* { 1, 2, 0, 5, 3, 4 }
*
* Muting the 3rd channel in 4-channel input: