Merge commit 'f5ba67ee1342b7741200ff637fc3ea3387b68a1b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 01:32:47 +0000 (03:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 01:32:47 +0000 (03:32 +0200)
commit77010a41fef047bff53536387db7fa043495bb6c
tree9e9e10b92cb41eb5babd36c1b42250943686e66e
parent7c24ca1bda2d4df1dc9b2b982941be532d60da21
parentf5ba67ee1342b7741200ff637fc3ea3387b68a1b
Merge commit 'f5ba67ee1342b7741200ff637fc3ea3387b68a1b'

* commit 'f5ba67ee1342b7741200ff637fc3ea3387b68a1b':
  flacenc: Move a scratch buffer to struct used by the function

Conflicts:
libavcodec/flacenc.c

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