aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/nut.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-22 16:53:20 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-22 16:53:26 +0200
commitfce350be0e7595846a6ce1a28bf240967283643e (patch)
tree329ae2ea9064efd9a8c8ad3428e4f41ec563fb3e /libavformat/nut.c
parentfbdbe7a5d262db06ae44a7bd606d18954241c040 (diff)
parent5655236a67203d923755f285584c6e68abe7e33f (diff)
downloadffmpeg-fce350be0e7595846a6ce1a28bf240967283643e.tar.gz
Merge commit '5655236a67203d923755f285584c6e68abe7e33f'
* commit '5655236a67203d923755f285584c6e68abe7e33f': asfdec: factor out seeking to the Data Object outside while Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/nut.c')
0 files changed, 0 insertions, 0 deletions