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)
commit702cf8d0de9e31c0bc62b6a671dfc54411b22fd6
treeef89fac3e81e0a01a7a84cfc90716ba4ed92dbaa
parent1cca12488617077732f8e47c67981e7c1957f296
parent6a5b8ca4329039fad44ad50b6496948f4bfacb4c
Merge commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c'

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

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

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