Merge commit '5bbfe193a0a41bd2adb648c8c3f6901a575734a2'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Sep 2013 10:37:35 +0000 (12:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Sep 2013 10:38:56 +0000 (12:38 +0200)
* commit '5bbfe193a0a41bd2adb648c8c3f6901a575734a2':
  vocdec: Don't update codec parameters mid-stream

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

Simple merge