diff options
| author | Michael Niedermayer <[email protected]> | 2015-04-24 20:56:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-04-24 21:09:03 +0200 |
| commit | 9c56cf09ca6da8b89c3155dc50f75232571d0be7 (patch) | |
| tree | b897989c7828519f0f30613ad71c88dbda070830 /libavformat/tcp.c | |
| parent | 036162a3787044cd82b6fa4e73eb56ddf2e57c96 (diff) | |
| parent | 3c04ec04df8cba12f3a7408709ff5c1fddfe8d82 (diff) | |
Merge commit '3c04ec04df8cba12f3a7408709ff5c1fddfe8d82'
* commit '3c04ec04df8cba12f3a7408709ff5c1fddfe8d82':
riff: Add GLV4 fourcc for mpeg4
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/tcp.c')
0 files changed, 0 insertions, 0 deletions