diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 01:22:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 01:26:57 +0200 |
| commit | 724deeb7a8dc512f2bd3c685e5ce35fd34ef91f8 (patch) | |
| tree | c28b65dde38c35933a0d7c3e71d7e48c00bcd47a /libavcodec/srtdec.c | |
| parent | 62899d79a380aadd95793beb096e74eb9c8b8776 (diff) | |
| parent | 4310ba273d3bcb7f19a4e40b55b9e832568e56e5 (diff) | |
| download | ffmpeg-724deeb7a8dc512f2bd3c685e5ce35fd34ef91f8.tar.gz | |
Merge commit '4310ba273d3bcb7f19a4e40b55b9e832568e56e5' into release/1.1
* commit '4310ba273d3bcb7f19a4e40b55b9e832568e56e5':
sgidec: fix an incorrect backport
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/srtdec.c')
0 files changed, 0 insertions, 0 deletions