summaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2012-09-01 14:22:58 +0200
committerMichael Niedermayer <[email protected]>2012-09-01 14:23:05 +0200
commit75a4b91f8354fbae24a38b94b26ddac6a114014e (patch)
treef4905ecdf726c8f40a2e4106f50e85726689588d /libavformat
parent899101d3d39d8165aa3c767efdb1d9c8a010d16d (diff)
parente30967710028950426c1c02f86a3bdaf463e5dce (diff)
Merge remote-tracking branch 'stev47/master'
* stev47/master: cpia: move reget_buffer after header check Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions