aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/oggparseskeleton.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-01 17:13:05 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-01 17:13:05 +0200
commit7426acff1aed209bc7db4c87697a5931e177eaf1 (patch)
treee61531c6a0f689f94d98ffeb7fca8e921bb390e5 /libavformat/oggparseskeleton.c
parente77b9853ea66ef6c34b04d121c5b3d1afaa33971 (diff)
parent18f2514c4037befd37b02e4d4f10c159edf3b26f (diff)
downloadffmpeg-7426acff1aed209bc7db4c87697a5931e177eaf1.tar.gz
Merge commit '18f2514c4037befd37b02e4d4f10c159edf3b26f'
* commit '18f2514c4037befd37b02e4d4f10c159edf3b26f': mov: export stsd Compressorname in metadata Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggparseskeleton.c')
0 files changed, 0 insertions, 0 deletions