Merge commit '355864ef7a9548ee6491a25de1e0650bd983a667'
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 12 Jul 2015 13:08:27 +0000 (15:08 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 12 Jul 2015 13:08:30 +0000 (15:08 +0200)
commite72988d3f804fbcf628fa95cb7374ac05ae61d84
tree44350c83ea935308b1329666907110679274dbeb
parent3a18d3fa047535980aa5368ebfda30ee0f1579cc
parent355864ef7a9548ee6491a25de1e0650bd983a667
Merge commit '355864ef7a9548ee6491a25de1e0650bd983a667'

* commit '355864ef7a9548ee6491a25de1e0650bd983a667':
  g726: Do not crash on user mistake

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/g726.c