diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 16:47:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 16:47:18 +0200 |
| commit | 19769766740bf4932c7920ca61d4df41e0610083 (patch) | |
| tree | 6f1cb56ef5549e7442692f062a12e74457c71a1d /COPYING.GPLv3 | |
| parent | 8fc441cee89cb3af5026facd7fc622074747e223 (diff) | |
| parent | ea78a348d86a3a733f6c1e0a65cfdd8283d924b9 (diff) | |
| download | ffmpeg-19769766740bf4932c7920ca61d4df41e0610083.tar.gz | |
Merge commit 'ea78a348d86a3a733f6c1e0a65cfdd8283d924b9'
* commit 'ea78a348d86a3a733f6c1e0a65cfdd8283d924b9':
eacmv: Make sure a reference frame exists before referencing it
Conflicts:
libavcodec/eacmv.c
See: 113d7be62497c4e59db8f224fdb7f0a90cf17d03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv3')
0 files changed, 0 insertions, 0 deletions