diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-11 12:17:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-11 12:18:05 +0100 |
| commit | bec37935ec28ad8d5c22a8adc977d833e8b1963c (patch) | |
| tree | 2438c19710c794d142809fd3d66e44596961c2f8 /libavformat/seek.c | |
| parent | 514910fb2d3b373fd80a5c6e6568e16490631378 (diff) | |
| parent | 6cd796049dc06eabe1a9714290713bd31024af9e (diff) | |
| download | ffmpeg-bec37935ec28ad8d5c22a8adc977d833e8b1963c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: h264_qpel_10bit: drop unused parameter from MC10/MC20/MC30 macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/seek.c')
0 files changed, 0 insertions, 0 deletions