Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libswresample / swresample.c

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 3079fc44f4318471e57d78d90a64342a365c1261..ff09ea4685ac9ebd4a6ab6af08eb1704ad1ad0d9 100644 (file)
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Michael Niedermayer (michaelni@gmx.at)
+ * Copyright (C) 2011-2012 Michael Niedermayer (michaelni@gmx.at)
  *
  * This file is part of libswresample
  *