diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 15:56:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 15:56:18 +0200 |
| commit | 580a0600efbb374ec2228ff4c0ac44528259cde3 (patch) | |
| tree | 60a4c6d8ee228b71c578518a7c53dfda1fbc3a99 /libavformat/rtpenc.c | |
| parent | ad9e66a56556a3135363121e8e115e4a592a16e2 (diff) | |
| parent | ac9362c5d985ca37d4debb4e0e12497d248ec9d1 (diff) | |
| download | ffmpeg-580a0600efbb374ec2228ff4c0ac44528259cde3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Move misplaced file author information where it belongs
Conflicts:
libavcodec/adpcm.c
libavcodec/adpcmenc.c
libavcodec/gif.c
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/fmtconvert_init.c
libavformat/au.c
libavformat/gif.c
libavformat/mov.c
libavformat/nsvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc.c')
0 files changed, 0 insertions, 0 deletions