Merge commit '0539d84d985e811e5989ef27c13f7e2dda0f9b89'
authorJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 03:18:10 +0000 (00:18 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 03:28:38 +0000 (00:28 -0300)
commit42f27d1b8eab9ea88d2e9faeb35f72dd72eca7b4
tree0e447ffc5700b355bd8699269726f07d6e2eddb2
parente2a5fa11b2a20a579d425ce6e162873660333445
parent0539d84d985e811e5989ef27c13f7e2dda0f9b89
Merge commit '0539d84d985e811e5989ef27c13f7e2dda0f9b89'

* commit '0539d84d985e811e5989ef27c13f7e2dda0f9b89':
  asfdec: Account for different Format Data sizes

See 76853a3e0ce4d4ef09ffcca7307991b8db832cd4

Merged-by: James Almer <jamrial@gmail.com>
libavformat/asfdec_o.c
libavformat/riff.h
libavformat/riffdec.c