diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 15:56:18 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 15:56:18 +0200 |
commit | 580a0600efbb374ec2228ff4c0ac44528259cde3 (patch) | |
tree | 60a4c6d8ee228b71c578518a7c53dfda1fbc3a99 /libavformat/mov.c | |
parent | ad9e66a56556a3135363121e8e115e4a592a16e2 (diff) | |
parent | ac9362c5d985ca37d4debb4e0e12497d248ec9d1 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Move misplaced file author information where it belongs
Conflicts:
libavcodec/adpcm.c
libavcodec/adpcmenc.c
libavcodec/gif.c
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/fmtconvert_init.c
libavformat/au.c
libavformat/gif.c
libavformat/mov.c
libavformat/nsvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov.c')
-rw-r--r-- | libavformat/mov.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 3c54ef3834..3e48f15e20 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3,6 +3,9 @@ * Copyright (c) 2001 Fabrice Bellard * Copyright (c) 2009 Baptiste Coudurier <baptiste dot coudurier at gmail dot com> * + * first version by Francois Revol <revol@free.fr> + * seek function by Gael Chardon <gael.dev@4now.net> + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -48,11 +51,6 @@ #include <zlib.h> #endif -/* - * First version by Francois Revol revol@free.fr - * Seek function by Gael Chardon gael.dev@4now.net - */ - #include "qtpalette.h" |