aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/segment.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-20 13:01:08 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-20 13:01:22 +0100
commit475d68e0f50140d8a8eb61ab3575d441b31c554b (patch)
treedb6c6ef30592ae714dbd9a93f196f1040623ee6b /libavformat/segment.c
parent7fd20799d785bd1ad568e6c19462fd710c0c7001 (diff)
parent3f10a779b465fd22d3aec1b744ca8544bc2da970 (diff)
downloadffmpeg-475d68e0f50140d8a8eb61ab3575d441b31c554b.tar.gz
Merge commit '3f10a779b465fd22d3aec1b744ca8544bc2da970' into release/2.2
* commit '3f10a779b465fd22d3aec1b744ca8544bc2da970': mmvideo: check frame dimensions See: 8b0e96e1f21b761ca15dbb470cd619a1ebf86c3e Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/segment.c')
0 files changed, 0 insertions, 0 deletions