aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtpdec_qdm2.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-16 14:13:20 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-16 14:13:20 +0100
commit131b9c924d6df2b52ca5821a13ddf6fdb49fe76c (patch)
tree9dfba94c2fb8f998a75b9bba1f2338681b333ef1 /libavformat/rtpdec_qdm2.c
parent0a707da37b4101730debda1a5600022bbb0b736e (diff)
parent68f930d2188aba5b32624887dcbf688c23482834 (diff)
downloadffmpeg-131b9c924d6df2b52ca5821a13ddf6fdb49fe76c.tar.gz
Merge commit '68f930d2188aba5b32624887dcbf688c23482834'
* commit '68f930d2188aba5b32624887dcbf688c23482834': h264: simplify calls to ff_er_add_slice(). Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_qdm2.c')
0 files changed, 0 insertions, 0 deletions