aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/bintext.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-21 12:01:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-21 12:01:58 +0200
commit1d8b1f0e51106c1a24cee565cd29ea469a1d83f8 (patch)
tree6a401fdbb8640e37ac4e3841c03fbfa5812f051b /libavformat/bintext.c
parent6ef7b6af6be0a1f8d4b355ccb692289857d1f967 (diff)
parent03ece7b0404f0104b71adc9c69051689863c4e4a (diff)
downloadffmpeg-1d8b1f0e51106c1a24cee565cd29ea469a1d83f8.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: proresdec: simplify slice component offsets handling Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/bintext.c')
0 files changed, 0 insertions, 0 deletions