summaryrefslogtreecommitdiffstats
path: root/libavcodec/truemotion2.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-01 02:37:30 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-01 02:38:06 +0200
commitf24b7d7616533cd00475d7bf93f3a33ff5ac40dc (patch)
tree046a75597c1ddbc7caa5b1cd9e4c93d881d8aca7 /libavcodec/truemotion2.c
parentabee1972ef8a88fde0bff5f40f4767cb3150d26e (diff)
parent28fb80dcbf6f63eedfcfffc725a6bf0069d03fab (diff)
downloadffmpeg-streaming-f24b7d7616533cd00475d7bf93f3a33ff5ac40dc.zip
ffmpeg-streaming-f24b7d7616533cd00475d7bf93f3a33ff5ac40dc.tar.gz
Merge commit '28fb80dcbf6f63eedfcfffc725a6bf0069d03fab'
* commit '28fb80dcbf6f63eedfcfffc725a6bf0069d03fab': svq1: Check memory allocation Conflicts: libavcodec/svq1enc.c See: 2a3af77284412b56eb0085f4b97d9db5aa04a64f Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/truemotion2.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud