diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-20 12:48:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-20 12:48:52 +0200 |
| commit | fb679d53743f3beed3ccb998c428c8b601cec59e (patch) | |
| tree | 290fda459e006965cc989b745615fb824f3aacb2 /libavutil/opt.c | |
| parent | eec75e0a1fc952d5ca31de8f5c8d934cfa52edf2 (diff) | |
| parent | 67400f6b6219892ab7a555fb61ef979c857692d7 (diff) | |
| download | ffmpeg-fb679d53743f3beed3ccb998c428c8b601cec59e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mov: Prevent segfaults on mov_write_hdlr_tag
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/opt.c')
0 files changed, 0 insertions, 0 deletions