diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 17:00:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 17:00:51 +0100 |
| commit | eba2c2321bc51b0faf5df379e5968ef2aa581cd8 (patch) | |
| tree | ef9ddfbde49c63bbd1695f9f95804d10ad7624a3 /libavcodec/ffv1enc.c | |
| parent | 72bec029ee18aada1c54101f4fa0aa991355321c (diff) | |
| parent | 404a416d4b1fcbf9db5569481d8181f296c01ea9 (diff) | |
| download | ffmpeg-eba2c2321bc51b0faf5df379e5968ef2aa581cd8.tar.gz | |
Merge commit '404a416d4b1fcbf9db5569481d8181f296c01ea9'
* commit '404a416d4b1fcbf9db5569481d8181f296c01ea9':
h264: remove some remnants of data partitioning
Conflicts:
libavcodec/h264.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ffv1enc.c')
0 files changed, 0 insertions, 0 deletions