diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-04 23:22:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-04 23:22:25 +0200 |
| commit | 3b364ac18a42182d0cd04f4041081469d3956132 (patch) | |
| tree | ee63eb75f4b0f75692650cf376f985067dffbb4b /tools | |
| parent | 63660277fd402f6d874087dcef6a8dbaa43e8f7a (diff) | |
| parent | ff24824a721576195c3b4a711e3ee2af900de795 (diff) | |
| download | ffmpeg-3b364ac18a42182d0cd04f4041081469d3956132.tar.gz | |
Merge commit 'ff24824a721576195c3b4a711e3ee2af900de795' into release/2.4
* commit 'ff24824a721576195c3b4a711e3ee2af900de795':
h264: reset ret to avoid propagating minor failures
See: 47048aa30b5c35fc8b030e819b9769b6bca03c08
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions