aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtp.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-07-07 20:29:43 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-07-07 20:29:43 +0200
commit3245c8b669018c43ad4bc18cb1720cb757526b85 (patch)
treea0d97815a1c6911452e3660fc494364a7146afa7 /libavformat/rtp.h
parente14052dbc8b2f6f0aef99326985e5331cfc98e08 (diff)
parentfdaad6354fbf1925c9bfeadd32950c503c1103ad (diff)
downloadffmpeg-3245c8b669018c43ad4bc18cb1720cb757526b85.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: mxfdec: replace x>>av_log2(sizeof(..)) by x/sizeof(..). x86: h264_intrapred: Don't add the 'd' suffix to the SPLATB_REG macro Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtp.h')
0 files changed, 0 insertions, 0 deletions