aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/wtv_common.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-08-18 08:50:22 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2015-08-18 08:50:22 +0200
commit1907e19d0ce2ad752912d73b798ebf4494aa1b1c (patch)
tree7ce15d4eb18d5d382a065f3bd815d04f06897018 /libavformat/wtv_common.c
parent737aa902f069ed218fd2d13c59015391facf73c8 (diff)
parent26ac22e5e7394346e9d59f800e7d4e91f4518d33 (diff)
downloadffmpeg-1907e19d0ce2ad752912d73b798ebf4494aa1b1c.tar.gz
Merge commit '26ac22e5e7394346e9d59f800e7d4e91f4518d33'
* commit '26ac22e5e7394346e9d59f800e7d4e91f4518d33': movenc: Add a new flag for writing global sidx indexes for dash Conflicts: libavformat/movenc.c libavformat/movenc.h Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/wtv_common.c')
0 files changed, 0 insertions, 0 deletions