generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c'

Browse Source 
* commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c':
  lavf: remove unused code

Conflicts:
	libavformat/seek.c
	libavformat/seek.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-02-11 01:43:00 +01:00
parent 1cca124886 6a5b8ca432
commit 702cf8d0de
4 changed files with 0 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/mpegts.c
View File

@@ -34,7 +34,6 @@
#include "mpegts.h"
#include "internal.h"
#include "avio_internal.h"
#include "seek.h"
#include "mpeg.h"
#include "isom.h"