diff options
| author | Michael Niedermayer <[email protected]> | 2013-06-03 12:33:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-06-03 12:33:00 +0200 |
| commit | 5c43f3ddea40fc76264d647750f6986a9247aead (patch) | |
| tree | d8ff70695eac396f832704edfa3c1083080677b7 /libavformat/riff.c | |
| parent | c3660c361822ffa9ae4fc47f655adab52a0f3c57 (diff) | |
| parent | 31980b6abdd8ffb6953472a7a6b59f3aa5762c31 (diff) | |
Merge commit '31980b6abdd8ffb6953472a7a6b59f3aa5762c31'
* commit '31980b6abdd8ffb6953472a7a6b59f3aa5762c31':
vmd: decode videos with no LZ buffer size provided - they might not need it
Conflicts:
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/riff.c')
0 files changed, 0 insertions, 0 deletions