Merge commit '6064f697a321174232a3fad351afb21150c3e9e5'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 13:12:05 +0000 (15:12 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 13:12:05 +0000 (15:12 +0200)
commit580c4fc98a213ff56ec95f95c30dde81cb7ef46c
treee540b1dbb8df192953f6f4e1e91fefefc001212d
parent141637002767d47154bffaf1463edcfd9445a5ee
parent6064f697a321174232a3fad351afb21150c3e9e5
Merge commit '6064f697a321174232a3fad351afb21150c3e9e5'

* commit '6064f697a321174232a3fad351afb21150c3e9e5':
  lavc: Enable side data only packets by default

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
ffmpeg.c
libavcodec/avcodec.h
libavcodec/flacenc.c
libavcodec/options_table.h
libavcodec/version.h