diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-10 10:20:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-10 10:20:11 +0200 |
| commit | 46405813c3c15caf8cee1cf9fa2bbaeead35c7cd (patch) | |
| tree | 43fd6900bac0a64ec18e5fe0d373575492c4a691 /libavformat/assdec.c | |
| parent | ada9b17e7a3d63b5c58d493006d7b17aa2617813 (diff) | |
| parent | bdf990425e2be6912a6d29f032ca558448c8635a (diff) | |
| download | ffmpeg-46405813c3c15caf8cee1cf9fa2bbaeead35c7cd.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Simplify setting the fragmentation flag
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/assdec.c')
0 files changed, 0 insertions, 0 deletions