projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c06ca7 925c378)
Merge commit '925c37874b617816b6f460c6f229c18b46548b46'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 May 2014 21:29:20 +0000 (23:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 May 2014 21:29:20 +0000 (23:29 +0200)
* commit '925c37874b617816b6f460c6f229c18b46548b46':
  vp9: Read the frame size as unsigned

Conflicts:
libavcodec/vp9.c

See: c72f587353d9f88c7fbbbf6ef78b1d9ba3d38fd7
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge
FFmpeg git repo