[FFmpeg-cvslog] Merge commit '20a8c78ce0a5baf37f6a94e2d1e57e186b6f4b54'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Jun 27 20:10:35 2016 +0200| [8b4d6cc809c2e67e8e32b3e46e011f78282c5710] | committer: Clément Bœsch

Merge commit '20a8c78ce0a5baf37f6a94e2d1e57e186b6f4b54'

* 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 at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b4d6cc809c2e67e8e32b3e46e011f78282c5710
---