diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-11 01:43:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-11 01:43:00 +0100 |
| commit | 702cf8d0de9e31c0bc62b6a671dfc54411b22fd6 (patch) | |
| tree | ef89fac3e81e0a01a7a84cfc90716ba4ed92dbaa /libavformat/mpegts.c | |
| parent | 1cca12488617077732f8e47c67981e7c1957f296 (diff) | |
| parent | 6a5b8ca4329039fad44ad50b6496948f4bfacb4c (diff) | |
Merge commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c'
* commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c':
lavf: remove unused code
Conflicts:
libavformat/seek.c
libavformat/seek.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegts.c')
| -rw-r--r-- | libavformat/mpegts.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 6fb186e627..cadce5c55a 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -34,7 +34,6 @@ #include "mpegts.h" #include "internal.h" #include "avio_internal.h" -#include "seek.h" #include "mpeg.h" #include "isom.h" |