Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 07:34:51 +0000 (09:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 07:37:21 +0000 (09:37 +0200)
commit92b03cf926efae224762dcc74d035cbf67b45368
treef1e2f0063ed4040339aa4c7e815a6c579857436a
parent8dbf98e68a9b7d92705661a2d6900c6d914a8068
parent601d6228c4811d8971a2412a759e1a4ab775ebe8
Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8'

* commit '601d6228c4811d8971a2412a759e1a4ab775ebe8':
  flac: move picture parsing code in a separate file

Conflicts:
libavformat/Makefile
libavformat/flacdec.c

See: 1e5bbbfcf303ec3db0c7db30b85855e2e5358aec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/Makefile
libavformat/flac_picture.c
libavformat/flac_picture.h
libavformat/flacdec.c
libavformat/oggparsevorbis.c