summaryrefslogtreecommitdiff
path: root/libavutil/arm
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-02 18:48:56 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-02 18:48:56 +0200
commitdd78e1090b4cae3fbaa71e266c4b6b2f82ea9b7c (patch)
tree18259ca73351256eb40623d0c1cc320d9c04c1aa /libavutil/arm
parent6cbbf4a274d42f92cdd2e98e83e95e23cbfbf976 (diff)
parent1e46c63eb72be752e044ba32257d77f35cbd9dac (diff)
Merge commit '1e46c63eb72be752e044ba32257d77f35cbd9dac'
* commit '1e46c63eb72be752e044ba32257d77f35cbd9dac': avformat: refactor avformat_write_header Conflicts: libavformat/mux.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm')
0 files changed, 0 insertions, 0 deletions