diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-25 12:58:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-25 13:05:08 +0200 |
| commit | 2904d052b7ca8714fda5c039c958bc0a0ae40877 (patch) | |
| tree | 7124a278835635a85ce1f180aa1cdd66eb9c0c6d /libavformat | |
| parent | 937eaba2a1159225aeef694d9b2e72d9eff0c8da (diff) | |
| parent | 7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac (diff) | |
| download | ffmpeg-2904d052b7ca8714fda5c039c958bc0a0ae40877.tar.gz | |
Merge commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac'
* commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac':
qpeldsp: Mark source pointer in qpel_mc_func function pointer const
Conflicts:
libavcodec/h264qpel_template.c
libavcodec/x86/cavsdsp.c
libavcodec/x86/rv40dsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions