diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-05 22:09:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-05 22:09:10 +0200 |
| commit | 37f080f6f6a8d757271f946be03408731527a8a5 (patch) | |
| tree | e3a5344773e108be532caca73b2c559d477b33c3 /doc | |
| parent | 473d1297427fff8cd00b08ce054e80a262efc6eb (diff) | |
| parent | 52cd84d4d4e335daf26eb8c8b60c2578b3341b91 (diff) | |
| download | ffmpeg-37f080f6f6a8d757271f946be03408731527a8a5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h261: Move mvmap table to the only place it is used
Conflicts:
libavcodec/h261data.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions