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)
* commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5':
  mpeg4videodec: Fix low_delay error message

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

Simple merge