Merge commit '6a5b8ca432
'
* commit '6a5b8ca432
':
lavf: remove unused code
Conflicts:
libavformat/seek.c
libavformat/seek.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
702cf8d0de
4 changed files with 0 additions and 631 deletions
|
@ -34,7 +34,6 @@
|
|||
#include "mpegts.h"
|
||||
#include "internal.h"
|
||||
#include "avio_internal.h"
|
||||
#include "seek.h"
|
||||
#include "mpeg.h"
|
||||
#include "isom.h"
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue