diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-08 12:54:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-08 12:54:18 +0200 |
| commit | 0138fe56563bc7aa59fb69fe81bcf3f5718b17a5 (patch) | |
| tree | b7eda67afbea295f9637603012333e6173603548 /libavformat/rtmpproto.c | |
| parent | 024a5f72eec54b9a3fcaa6fc568ae1e21ac0a6a6 (diff) | |
| parent | d2ec6ea6c6c0276aaf0063c5a7290f8e11fcdb06 (diff) | |
| download | ffmpeg-0138fe56563bc7aa59fb69fe81bcf3f5718b17a5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: Move ff_cropTbl and ff_zigzag_direct from dsputil to mathtables
Conflicts:
libavcodec/mathtables.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmpproto.c')
0 files changed, 0 insertions, 0 deletions