diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 14:39:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 14:39:55 +0200 |
| commit | 7434225ed15d7326cf9d906a7cd3539eb8184e8e (patch) | |
| tree | 028363b61042619d7f3db2d08665a50dec6bc04c /libavutil/parseutils.c | |
| parent | c9f17afe4e3c1fb57d089a8de5237851b0c0122b (diff) | |
| parent | 30e58e65e543d04d5e52bf188b31abf4dd41a104 (diff) | |
| download | ffmpeg-7434225ed15d7326cf9d906a7cd3539eb8184e8e.tar.gz | |
Merge commit '30e58e65e543d04d5e52bf188b31abf4dd41a104' into release/1.1
* commit '30e58e65e543d04d5e52bf188b31abf4dd41a104':
h264_refs: make sure not to write over the bounds of the default ref list
Conflicts:
libavcodec/h264_refs.c
See: 0a5ca63c24b8a07f94611637ba29e41b8b47ce24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions