diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-27 15:02:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-27 15:02:35 +0200 |
| commit | 95760b33e7a4fb06686922e93e8c6b5730e85d3f (patch) | |
| tree | 48f235f3dea0e74791d2ef3cfefe2082ee4a5a58 /libswscale | |
| parent | c25e9292ba5b5d4f2ba52004d3593a1dafdfe427 (diff) | |
| parent | 1aa07aa21c4ee39f0ed5fcd33d8259eed74bd3ab (diff) | |
| download | ffmpeg-95760b33e7a4fb06686922e93e8c6b5730e85d3f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: fix tests for 2-arg math functions
doc: git-howto: Clarify comment about pushing series of commits
ivi_common: Drop unused function parameter from decode_band()
cook: Remove some silly Doxygen comments
cook: Remove senseless maybe_reformat_buffer32() function
cook: cosmetics: Better names for joint_decode() function parameters
cook: cosmetics: Better name for ccpl COOKSubpacket member
doxygen: Add av_alloc_size to list of predefined macros
doxygen: Drop some pointless entries from PREDEFINED macros list
h263: avoid memcpys over array bound in motion vector caching for obmc
Conflicts:
configure
doc/git-howto.texi
libavcodec/cook.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions