aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/subfile.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-28 00:57:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-28 01:00:10 +0200
commitb5657516b2b2cc302421b58151e0ab968a3cc737 (patch)
tree8575ae60fdade4a930a02a20f4bd70ebc4432070 /libavformat/subfile.c
parent5313d60dc0f2287f61a900a1f2b9d910eeb2bdbf (diff)
parent9767d7c092c890ecc5953452e8a951fd902dd67b (diff)
downloadffmpeg-b5657516b2b2cc302421b58151e0ab968a3cc737.tar.gz
Merge commit '9767d7c092c890ecc5953452e8a951fd902dd67b'
* commit '9767d7c092c890ecc5953452e8a951fd902dd67b': oggenc: Flush after writing headers Conflicts: tests/ref/lavf/ogg Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/subfile.c')
0 files changed, 0 insertions, 0 deletions