diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-08 12:40:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-08 12:40:26 +0200 |
| commit | 5f49e92eb934d56fc1f031b579281ce48c251c4f (patch) | |
| tree | 496c9126e0ba86c6e1bc544b5fa510412e9db21f /libavformat/rtmpproto.c | |
| parent | 1090f69386abefc0a081dd000ae8187243425f71 (diff) | |
| parent | 610b18e2e3d8ef5eca3e78f33a0625689b8d2bb9 (diff) | |
| download | ffmpeg-5f49e92eb934d56fc1f031b579281ce48c251c4f.tar.gz | |
Merge commit '610b18e2e3d8ef5eca3e78f33a0625689b8d2bb9'
* commit '610b18e2e3d8ef5eca3e78f33a0625689b8d2bb9':
x86: qpel: Move fullpel and l2 functions to a separate file
bfin: Make vp3 functions static
Conflicts:
libavcodec/bfin/vp3_bfin.c
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmpproto.c')
0 files changed, 0 insertions, 0 deletions