aboutsummaryrefslogtreecommitdiffstats
path: root/presets
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-02 18:31:47 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-02 18:36:09 +0200
commit6cbbf4a274d42f92cdd2e98e83e95e23cbfbf976 (patch)
treeb7c801a9e59f8ea8c64ed28b0ed15251c5eeba62 /presets
parent513042c92669dbfcd604a9dcdb96176e05ecba90 (diff)
parent86bbdf865e04bc5ddc2021b0620e6de634375253 (diff)
downloadffmpeg-6cbbf4a274d42f92cdd2e98e83e95e23cbfbf976.tar.gz
Merge commit '86bbdf865e04bc5ddc2021b0620e6de634375253'
* commit '86bbdf865e04bc5ddc2021b0620e6de634375253': avformat: refactor avformat_write_header Conflicts: libavformat/mux.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets')
0 files changed, 0 insertions, 0 deletions