Merge commit 'aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Jan 2014 01:32:12 +0000 (02:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Jan 2014 01:32:12 +0000 (02:32 +0100)
commit3b8299c1e1c72fdd4284d88e7d426bd35689acd3
tree6d3df80c51f8c65829bc8b764c330b06df67bc3f
parent4162ceea93684f3cd656dc21d30903e102a44e73
parentaa69cbc9e08281db6ecb98a2c8b4f60e8b12e558
Merge commit 'aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558'

* commit 'aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558':
  flac muxer: add option to disable writing the global header

Conflicts:
libavformat/version.h

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