diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 14:53:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 14:54:06 +0100 |
| commit | 45660c7d1b76185de97160808d81885f9dd08e23 (patch) | |
| tree | 5bceeb9f889df2adc208e2b508022a1bb6ad0d8b /libavcodec/sipr.c | |
| parent | 057b74d19c0f1493b3aff14439648a9122128f1a (diff) | |
| parent | 59846452af762f6af5ced4399e8dcd709ca50fcd (diff) | |
| download | ffmpeg-45660c7d1b76185de97160808d81885f9dd08e23.tar.gz | |
Merge commit '59846452af762f6af5ced4399e8dcd709ca50fcd'
* commit '59846452af762f6af5ced4399e8dcd709ca50fcd':
svq1enc: check ff_get_buffer return value
Conflicts:
libavcodec/svq1enc.c
See: 7effc26ba74717bb9c808d96791c7cf98911d1a1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sipr.c')
0 files changed, 0 insertions, 0 deletions