Merge commit '3a177a9cca924e097265b32f9282814f6b653e08'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 May 2014 21:36:01 +0000 (23:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 May 2014 21:36:54 +0000 (23:36 +0200)
commit1c4110be90380fbe7c6bac1306616b79325107ed
treeb5212cd3ed67cc8cea1dfcaf1d874199ed095c27
parent039630631e96cc04d09101acf71756174ce00dad
parent3a177a9cca924e097265b32f9282814f6b653e08
Merge commit '3a177a9cca924e097265b32f9282814f6b653e08'

* commit '3a177a9cca924e097265b32f9282814f6b653e08':
  swscale: Fix an undefined behaviour

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/utils.c