diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:54:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:54:48 +0100 |
| commit | 72bec029ee18aada1c54101f4fa0aa991355321c (patch) | |
| tree | 47268273f5e21e270ba5614ae22ae141f2bca724 /libavcodec/assdec.c | |
| parent | d76559fb5f529db5f14d304936cadebce902b68c (diff) | |
| parent | 7bbc254d646ed9cf6deffc3fda75ae6729f95979 (diff) | |
| download | ffmpeg-72bec029ee18aada1c54101f4fa0aa991355321c.tar.gz | |
Merge commit '7bbc254d646ed9cf6deffc3fda75ae6729f95979'
* commit '7bbc254d646ed9cf6deffc3fda75ae6729f95979':
h264: move resync_mb_{x,y} into the per-slice context
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/assdec.c')
0 files changed, 0 insertions, 0 deletions