Merge commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Sep 2014 19:01:10 +0000 (21:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Sep 2014 19:01:33 +0000 (21:01 +0200)
commitf9aadf1fc426412e94c06f5d34516c8dba73cd6a
tree45919764cf89a713fe9a6f7ca10ee577503ae1b5
parentf626eaa58e69532ff85044007b2ceb3ce8dd5ed2
parente205fe6831fe1b5445f7827b5c916425620b4ab5
Merge commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5'

* commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5':
  mpeg4videodec: Fix low_delay error message

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg4videodec.c