diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-21 11:40:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-21 11:45:42 +0100 |
| commit | 6458e4750f4dc93b7bbbdf08d4de7c9e6ef8ac61 (patch) | |
| tree | f28ea1938432fdc9c6f250443ed15e03ab44a8f9 /libavresample | |
| parent | 66d79aa2e1351ac38f3469bba6a8b1fcaefa0c20 (diff) | |
| parent | 0dea4c77ccf5956561bb8991311b3d834bb5fa40 (diff) | |
| download | ffmpeg-6458e4750f4dc93b7bbbdf08d4de7c9e6ef8ac61.tar.gz | |
Merge commit '0dea4c77ccf5956561bb8991311b3d834bb5fa40'
* commit '0dea4c77ccf5956561bb8991311b3d834bb5fa40':
h264: only ref cur_pic in update_thread_context if it is initialized
Conflicts:
libavcodec/h264_slice.c
See: 0fc01ae33c7712168aab0f98c5715b40da0b5f03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions