diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 15:51:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 15:52:44 +0100 |
| commit | a4f8a5649561906ccad7f15247f033e7b8df4a4e (patch) | |
| tree | 58dc2a31b81513c6c9d2320c95a6b7d5472035a8 /libavcodec/h264.c | |
| parent | 3328d105f76c21e5ca87471b8a8b51af9801dc17 (diff) | |
| parent | 4736d003fac30af4afd8390182f12f480ad78801 (diff) | |
| download | ffmpeg-a4f8a5649561906ccad7f15247f033e7b8df4a4e.tar.gz | |
Merge commit '4736d003fac30af4afd8390182f12f480ad78801'
* commit '4736d003fac30af4afd8390182f12f480ad78801':
cavsdec: check ff_get_buffer() return value
Conflicts:
libavcodec/cavsdec.c
See: eee8c94f50bfcd93c1f761b4e6b55bec3815616d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
0 files changed, 0 insertions, 0 deletions