diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-24 12:45:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-24 12:45:07 +0100 |
| commit | 932d8d790ccf4e8ce67b97057e5aaf738bbfc65a (patch) | |
| tree | 84857db0f1a924e3b1ebf664122c203cffb94508 /libswresample/x86 | |
| parent | 010adacbe2363a5f98d62db8fae7b0009552b801 (diff) | |
| parent | 277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2 (diff) | |
| download | ffmpeg-932d8d790ccf4e8ce67b97057e5aaf738bbfc65a.tar.gz | |
Merge commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2'
* commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2':
lavu: move internal define to the only places where it is used
Conflicts:
libavcodec/h264_cabac.c
libavutil/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/x86')
0 files changed, 0 insertions, 0 deletions