diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-16 14:21:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-16 14:22:26 +0200 |
| commit | 7283d2bb90ab0b885ab2a53219123be3bca08010 (patch) | |
| tree | 93843835d1113f28488ef654c043537764147de6 /libavfilter/dualinput.c | |
| parent | b3970b39491ffab25a9c922f384855aca81d50b2 (diff) | |
| parent | 85e8192b8593816c0445411a5bef5fc5363a9b6d (diff) | |
| download | ffmpeg-7283d2bb90ab0b885ab2a53219123be3bca08010.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avpacket: Fix error checking in packet_alloc
Conflicts:
libavcodec/avpacket.c
See: b905a7137a51a9a4f66d75172897d1f38c0b292a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/dualinput.c')
0 files changed, 0 insertions, 0 deletions