diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 21:30:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 21:30:37 +0100 |
| commit | 9ecfe0b87834576ce69401067fe1130a723eb2d4 (patch) | |
| tree | cfc802dd3308e6d1c27bb1ad50fdd0cd763932d9 /libswresample/Makefile | |
| parent | 0bc2da6dcf17e599f3d7dc6bb22880510c2a11a9 (diff) | |
| parent | a72d93daa09ffbad2771f1450820941055eaf210 (diff) | |
| download | ffmpeg-9ecfe0b87834576ce69401067fe1130a723eb2d4.tar.gz | |
Merge commit 'a72d93daa09ffbad2771f1450820941055eaf210'
* commit 'a72d93daa09ffbad2771f1450820941055eaf210':
mpegvideo_enc: Check AVCodecContext allocation
Conflicts:
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/Makefile')
0 files changed, 0 insertions, 0 deletions