diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-16 15:08:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-16 15:08:10 +0200 |
| commit | 4d41a25d3940f1fdd5f87fa75885f25f4568fee8 (patch) | |
| tree | a1f1ee39e0409952c237d19162e4733baf12f4a2 /libavcodec/ass.c | |
| parent | 8210e3846129c6be11322cefa85651bfcf85c257 (diff) | |
| parent | 825c7c62bb66c9ee6117e0dcb71915271faa46c6 (diff) | |
| download | ffmpeg-4d41a25d3940f1fdd5f87fa75885f25f4568fee8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: Move 8x8 in a separate function
Conflicts:
libavcodec/mpegvideo_motion.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ass.c')
0 files changed, 0 insertions, 0 deletions