diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 12:04:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 12:11:09 +0200 |
| commit | 580c86925ddf8c85d2e6f57ed55dd75853748b29 (patch) | |
| tree | ece1fac050df9fac73b81b0b8b8fa268d9adcd84 /libavcodec/mpeg4video_parser.c | |
| parent | cd63252f1ff61d894a1c3a59fee7d1e49dbfdeb4 (diff) | |
| parent | 54986d6db9116ef9704b1ce8414ffdb7f1ca127f (diff) | |
| download | ffmpeg-streaming-580c86925ddf8c85d2e6f57ed55dd75853748b29.zip ffmpeg-streaming-580c86925ddf8c85d2e6f57ed55dd75853748b29.tar.gz | |
Merge commit '54986d6db9116ef9704b1ce8414ffdb7f1ca127f'
* commit '54986d6db9116ef9704b1ce8414ffdb7f1ca127f':
h264: move context reinit lower down in update_thread_context()
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video_parser.c')
0 files changed, 0 insertions, 0 deletions
