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)
commit05c5dd403d6a6974eb0a0688fcd22fe0417c2d84
treea828719793f5dc2ecf6d393122cb7a711deb796a
parent03bb99ae1a99fa315621308b885a8fc70702c9bc
parented39cda02923316b6710c1bcc34d3445370be5b4
Merge commit 'ed39cda02923316b6710c1bcc34d3445370be5b4'

* commit 'ed39cda02923316b6710c1bcc34d3445370be5b4':
  flacenc: send final extradata in packet side data

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