aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264_mvpred.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-10 01:12:08 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-03-10 01:12:08 +0100
commit8e31dbc1dcb56d40bcc1dd45840aaef0d37bae51 (patch)
tree08342b8eede67521c32c139ebb4d9ddd04e871fa /libavcodec/h264_mvpred.h
parent1af9fdc3baa47596757da7c401d58710cef45c75 (diff)
parentffae713a5b3a0d20ff958d8bd58a052b495c38fd (diff)
downloadffmpeg-8e31dbc1dcb56d40bcc1dd45840aaef0d37bae51.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: Fix a bunch of common typos. build: Skip compiling xvmc.h under the correct condition. configure: darwin: Change dylib install names to include major version. mpegts: Always honor a registration descriptor if present and there is no other codec information. aacdec: Fix SCE parity check. aacdec: Fix out of array writes (stack). rtsp: Only set the ttl parameter if the server actually gave a value udp: Set ttl for read-write streams, too, not only for write-only ones udp: Only bind to the multicast address if in read-only mode udp: Clarify the comment about binding the multicast address udp: Reorder comments Conflicts: libavcodec/aacdec.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mvpred.h')
0 files changed, 0 insertions, 0 deletions