diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 19:42:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 19:42:15 +0200 |
| commit | b5ae0e349adc1c9581a6d88e9ba55cc5dd4493c2 (patch) | |
| tree | f5e895f760594436a308e86abb50a7c8a69785b9 | |
| parent | 0a83007ceee404f9bfdcfc3feb780ace58738eaf (diff) | |
| parent | 3e60501f311c50bf234033f206c19d34d889df01 (diff) | |
| download | ffmpeg-b5ae0e349adc1c9581a6d88e9ba55cc5dd4493c2.tar.gz | |
Merge commit '3e60501f311c50bf234033f206c19d34d889df01' into release/0.10
* commit '3e60501f311c50bf234033f206c19d34d889df01':
h264: slice-mt: check master context for valid current_picture_ptr
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions