aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/hevc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-29 19:59:10 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-10-29 20:01:00 +0100
commit42bf156e132b2bd48dab982a58ba119518b0eafd (patch)
tree8cf236f4e770bc0e01d085cb1c8111dd98866106 /libavcodec/hevc.c
parent6c5f17e738a5d8a848fb3f2c5fe21f5ca91a9db9 (diff)
parent327c439f811a89d774db9a86f72951d295193e5f (diff)
downloadffmpeg-42bf156e132b2bd48dab982a58ba119518b0eafd.tar.gz
Merge commit '327c439f811a89d774db9a86f72951d295193e5f'
* commit '327c439f811a89d774db9a86f72951d295193e5f': timefilter: Handle memory allocation failure Conflicts: libavdevice/jack_audio.c libavdevice/timefilter.c See: 6ef30976e00a07ed7c6db54102d2ba50d24c876c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc.c')
0 files changed, 0 insertions, 0 deletions