diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-03 23:29:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-03 23:29:20 +0200 |
| commit | 039630631e96cc04d09101acf71756174ce00dad (patch) | |
| tree | a4f16925f82c2cca8fe993e7d6146f63aa894355 /libavcodec/libfaac.c | |
| parent | 0c06ca7a8ab46df0268d049e7c2067ef29a5f77d (diff) | |
| parent | 925c37874b617816b6f460c6f229c18b46548b46 (diff) | |
| download | ffmpeg-039630631e96cc04d09101acf71756174ce00dad.tar.gz | |
Merge commit '925c37874b617816b6f460c6f229c18b46548b46'
* commit '925c37874b617816b6f460c6f229c18b46548b46':
vp9: Read the frame size as unsigned
Conflicts:
libavcodec/vp9.c
See: c72f587353d9f88c7fbbbf6ef78b1d9ba3d38fd7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libfaac.c')
0 files changed, 0 insertions, 0 deletions