aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/xa.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-08-10 11:23:21 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2015-08-10 11:23:21 +0200
commit7653ebfff6ea3f91ea81599ba8e2af922c510ecb (patch)
tree9f3e055049800aa8e1b053b61083e66937a0a6e8 /libavformat/xa.c
parent6c52432b4812acd68c2b93cdc367828cb73b68a4 (diff)
parent83f254e65f938657a4dbec711e4c94252a72daf9 (diff)
downloadffmpeg-7653ebfff6ea3f91ea81599ba8e2af922c510ecb.tar.gz
Merge commit '83f254e65f938657a4dbec711e4c94252a72daf9'
* commit '83f254e65f938657a4dbec711e4c94252a72daf9': movenc: Rename reserved_moov_pos to reserved_header_pos Conflicts: libavformat/movenc.c libavformat/movenc.h Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/xa.c')
0 files changed, 0 insertions, 0 deletions