Merge commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Feb 2015 00:43:00 +0000 (01:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Feb 2015 00:43:00 +0000 (01:43 +0100)
* commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c':
  lavf: remove unused code

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/Makefile
libavformat/mpegts.c

Simple merge
Simple merge