diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 02:56:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 02:56:33 +0100 |
| commit | 1f27053b91e4f0b1f6571448db9e363fd84e65b6 (patch) | |
| tree | 80a21139597213277feb0fa99a3006d4a1b800dd /libavcodec/rnd_avg.h | |
| parent | d3edc65dd1e5b5d4246fcb8bcd216eb558bab7d4 (diff) | |
| parent | de27d2b92fa97deb2856d18e9f5f19586ce45a0f (diff) | |
Merge commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f'
* commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f':
lavc: remove disabled FF_API_LIBMPEG2 cruft
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rnd_avg.h')
0 files changed, 0 insertions, 0 deletions