diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:25:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:46:15 +0100 |
| commit | d76559fb5f529db5f14d304936cadebce902b68c (patch) | |
| tree | cc7c6a35be33afc181a7a03749fdab72b693cd0c /libavcodec/mpegaudioenc_template.c | |
| parent | 668c65e7e73a21c86f43ffa1f79bf023fa44cbcd (diff) | |
| parent | d4d9068cdf8f4b2b87ae87a2ef880d243f77b977 (diff) | |
| download | ffmpeg-d76559fb5f529db5f14d304936cadebce902b68c.tar.gz | |
Merge commit 'd4d9068cdf8f4b2b87ae87a2ef880d243f77b977'
* commit 'd4d9068cdf8f4b2b87ae87a2ef880d243f77b977':
h264: move mb_{x,y} into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_cavlc.c
libavcodec/h264_mb.c
libavcodec/h264_slice.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudioenc_template.c')
0 files changed, 0 insertions, 0 deletions