aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-10 13:11:38 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-10 13:11:53 +0100
commitb69c7f20e84f7aea5f5d8aaf2bdb4ec80044a69f (patch)
tree446560838fe3747ec6ed509a22aab996535b9934 /libavformat/utils.c
parent31b697f19c0a6e11fc7832500314a3366e7631be (diff)
parenteb1aa871d4ef9fc11484de436fa02c352b1b7cac (diff)
downloadffmpeg-b69c7f20e84f7aea5f5d8aaf2bdb4ec80044a69f.tar.gz
Merge commit 'eb1aa871d4ef9fc11484de436fa02c352b1b7cac' into release/1.1
* commit 'eb1aa871d4ef9fc11484de436fa02c352b1b7cac': h264_cabac: Break infinite loops Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions