aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/asfdec_o.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-03-31 15:16:44 -0300
committerJames Almer <jamrial@gmail.com>2017-03-31 15:17:16 -0300
commit51d95914e00ce20bea474625cf59e1ff3867b200 (patch)
tree75612937cd40b35f5943f8d1055266fca479bbf5 /libavformat/asfdec_o.c
parent13a211e6320d061d9e8c29354c81239324b2db03 (diff)
parent98cae966c77875e26c5958206a6cfe7eba6269e8 (diff)
downloadffmpeg-51d95914e00ce20bea474625cf59e1ff3867b200.tar.gz
Merge commit '98cae966c77875e26c5958206a6cfe7eba6269e8'
* commit '98cae966c77875e26c5958206a6cfe7eba6269e8': matroskaenc: write updated STREAMINFO metadata for FLAC streams if available This commit is a noop, see 8c1342e631d635f6cad13f9374c4f2005c22b9e5 Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/asfdec_o.c')
0 files changed, 0 insertions, 0 deletions