Merge commit '0c082565965258dca143767cc6cb25e38b6e9ea3'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Feb 2014 15:16:16 +0000 (16:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Feb 2014 15:16:16 +0000 (16:16 +0100)
commitf73901f815d0c6e1e9dbe6d8541e43d633b06d63
tree4071c87ee47d8056cdd20bd8fe8a49d523e3ddf5
parent5634c9518f07b6767894b8a9556a8c8527c207b2
parent0c082565965258dca143767cc6cb25e38b6e9ea3
Merge commit '0c082565965258dca143767cc6cb25e38b6e9ea3'

* commit '0c082565965258dca143767cc6cb25e38b6e9ea3':
  asfdec: short-circuit seeking to the start of stream

Conflicts:
libavformat/asfdec.c

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