aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtpdec_amr.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-19 01:25:32 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-19 01:25:50 +0200
commit602d0bfe67ce20e169433ca583153e5c01c84016 (patch)
tree995e83b980b76935144df98082d73ddd43bbeb09 /libavformat/rtpdec_amr.c
parentf8ca8138f01d0a7d96d4e1ea65fecd1197f96206 (diff)
parent2090abcc436df92969634577c91ea1d1143d4533 (diff)
downloadffmpeg-602d0bfe67ce20e169433ca583153e5c01c84016.tar.gz
Merge branch 'frame_num_offset' of https://github.com/mjmvisser/FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_amr.c')
0 files changed, 0 insertions, 0 deletions