diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 02:39:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 02:40:01 +0100 |
| commit | 65b2973a543366fe398e9f376fa0ec0bda030b0a (patch) | |
| tree | a623139f5964050e2953daf0b17189a360812e69 | |
| parent | a0bad45cd8e744a17f51b42c236715880b02eafe (diff) | |
| parent | 21aeae9c679657a1537d0d9127eff280bafc901a (diff) | |
| download | ffmpeg-65b2973a543366fe398e9f376fa0ec0bda030b0a.tar.gz | |
Merge commit '21aeae9c679657a1537d0d9127eff280bafc901a' into release/2.4
* commit '21aeae9c679657a1537d0d9127eff280bafc901a':
svq1enc: check ff_get_buffer return value
Conflicts:
libavcodec/svq1enc.c
See: 7effc26ba74717bb9c808d96791c7cf98911d1a1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions