Merge commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 12:16:29 +0000 (14:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 12:16:29 +0000 (14:16 +0200)
commit955b31a7513e924cce36e484dc098581290af9b6
treef063480e25161f2038c50e9106c0a9666beebb50
parent855e3b5700fff78bf20f900daade58396b73846d
parente19d48dfce52f1417f7f06143b96fed00cbcdc52
Merge commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52'

* commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52':
  flac muxer: support reading updated extradata from side data

Conflicts:
libavformat/flacenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/flacenc.c
libavformat/flacenc.h
libavformat/flacenc_header.c
libavformat/matroskaenc.c