[FFmpeg-cvslog] Merge commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun  1 14:16:29 2014 +0200| [955b31a7513e924cce36e484dc098581290af9b6] | committer: Michael Niedermayer

Merge commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52'

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

Conflicts:
	libavformat/flacenc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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