aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-11 01:43:00 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-11 01:43:00 +0100
commit702cf8d0de9e31c0bc62b6a671dfc54411b22fd6 (patch)
treeef89fac3e81e0a01a7a84cfc90716ba4ed92dbaa /libavcodec
parent1cca12488617077732f8e47c67981e7c1957f296 (diff)
parent6a5b8ca4329039fad44ad50b6496948f4bfacb4c (diff)
downloadffmpeg-702cf8d0de9e31c0bc62b6a671dfc54411b22fd6.tar.gz
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 'libavcodec')
0 files changed, 0 insertions, 0 deletions