summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-28 12:07:23 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-10-28 12:09:12 +0100
commita66ee3dc87c5650016df7dcd00c4ce0202f0c3ce (patch)
tree9b8ef203d5c422de8306806f49cff25fe3b7ef22 /libavformat
parentd57a6fe6abdab934063b809e43096bf887d01696 (diff)
parentaaaf2dc023d31f30eeec874f24b50f44b9295185 (diff)
Merge commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185'
* commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185': h263: Check init_get_bits return value Conflicts: libavcodec/h263dec.c See: d47e14b53a3908e5bad82e22129bbd175b49e89b Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions