diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:31:44 +0000 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:31:44 +0000 |
commit | 1a12eb4a7314900b9569d6cc76814f39f95922bd (patch) | |
tree | 8f4644f71ca5f336b1cbb1434b7087bcdf2192dd /libavformat | |
parent | cb0355537d6a89fc71fbc672ad5dba8a1eadce34 (diff) | |
parent | 29c2d06d67724e994980045afa055c6c34611b30 (diff) | |
download | ffmpeg-1a12eb4a7314900b9569d6cc76814f39f95922bd.tar.gz |
Merge commit '29c2d06d67724e994980045afa055c6c34611b30'
* commit '29c2d06d67724e994980045afa055c6c34611b30':
cosmetics: Drop empty comment lines
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/avformat.h | 1 | ||||
-rw-r--r-- | libavformat/avio_internal.h | 1 | ||||
-rw-r--r-- | libavformat/rtpdec_hevc.c | 1 | ||||
-rw-r--r-- | libavformat/unix.c | 1 | ||||
-rw-r--r-- | libavformat/url.h | 1 | ||||
-rw-r--r-- | libavformat/wtvdec.c | 4 |
6 files changed, 0 insertions, 9 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 34bad436cd..2b6533c957 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -310,7 +310,6 @@ * @{ * @} * @} - * */ #include <time.h> diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index f7c85882e7..54bdfa1cf9 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -1,5 +1,4 @@ /* - * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or diff --git a/libavformat/rtpdec_hevc.c b/libavformat/rtpdec_hevc.c index 1f09a08aa4..68ca17f3cb 100644 --- a/libavformat/rtpdec_hevc.c +++ b/libavformat/rtpdec_hevc.c @@ -17,7 +17,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ #include "libavutil/avassert.h" diff --git a/libavformat/unix.c b/libavformat/unix.c index b3d5fac2be..6375be15b6 100644 --- a/libavformat/unix.c +++ b/libavformat/unix.c @@ -23,7 +23,6 @@ * @file * * Unix socket url_protocol - * */ #include "libavutil/avstring.h" diff --git a/libavformat/url.h b/libavformat/url.h index 0b4f2ee376..5948df684f 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -1,5 +1,4 @@ /* - * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index 71deaf0aa6..16f1ef7b9c 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -44,9 +44,7 @@ #define LEN_PRETTY_GUID 34 /* - * * File system routines - * */ typedef struct WtvFile { @@ -311,9 +309,7 @@ static void wtvfile_close(AVIOContext *pb) } /* - * * Main demuxer - * */ typedef struct WtvStream { |