Merge commit '20a8c78ce0a5baf37f6a94e2d1e57e186b6f4b54'
authorClément Bœsch <u@pkh.me>
Mon, 27 Jun 2016 18:10:35 +0000 (20:10 +0200)
committerClément Bœsch <u@pkh.me>
Mon, 27 Jun 2016 18:10:35 +0000 (20:10 +0200)
* commit '20a8c78ce0a5baf37f6a94e2d1e57e186b6f4b54':
  avconv: Do not copy extradata if source buffer is empty

This commit is a noop, see 4d02dfbde475d249916eb19c360e890059aa6aa5

Merged-by: Clément Bœsch <u@pkh.me>

Trivial merge