aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/tscc2data.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-12 00:40:54 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-12 00:41:02 +0100
commit3efe5e3b094ae8561b31416adb80de33ccd04234 (patch)
tree0f055b630f5d3cb5da8587b57b65e88ac1356c2c /libavcodec/tscc2data.h
parent44967ab60a9baf62f86bc727b51ff0acb587e676 (diff)
parent70e981cf5d75abc9bff076969270b587a0004d3f (diff)
downloadffmpeg-3efe5e3b094ae8561b31416adb80de33ccd04234.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: rtspdec: Fix keep-alive request for ACTi cameras Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/tscc2data.h')
0 files changed, 0 insertions, 0 deletions