Merge commit 'ed39cda02923316b6710c1bcc34d3445370be5b4'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 11:55:03 +0000 (13:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 11:55:49 +0000 (13:55 +0200)
* commit 'ed39cda02923316b6710c1bcc34d3445370be5b4':
  flacenc: send final extradata in packet side data

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

Simple merge