diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 13:30:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 13:31:59 +0200 |
| commit | a44d35d90ffa0cfc3eb8a8a8fc6c20ffec4e90fe (patch) | |
| tree | 2650f965bb85fc7e5955e40b250a8570b51057ea /libavcodec/parser.h | |
| parent | af539319af3a2c173e275fb927c7069e6b167114 (diff) | |
| parent | 49568851bf1700e3d9ea9cda29208d0df3c2c38b (diff) | |
| download | ffmpeg-a44d35d90ffa0cfc3eb8a8a8fc6c20ffec4e90fe.tar.gz | |
Merge commit '49568851bf1700e3d9ea9cda29208d0df3c2c38b'
* commit '49568851bf1700e3d9ea9cda29208d0df3c2c38b':
shorten: Use a checked bytestream reader for the wave header
Conflicts:
libavcodec/shorten.c
See: 5e9a56a0350c518cd4b38845aff49d41a9c952ae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/parser.h')
0 files changed, 0 insertions, 0 deletions