Michael Niedermayer
|
1c667626bb
|
Merge commit '386e2755aab73ae7075f78d92786cb5c5419597a'
* commit '386e2755aab73ae7075f78d92786cb5c5419597a':
jack: Check memory allocation
Conflicts:
libavdevice/jack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2015-04-20 12:46:29 +02:00 |
Federico Tomassetti
|
386e2755aa
|
jack: Check memory allocation
Bug-Id: CID 1265785
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
|
2015-04-19 23:50:48 +01:00 |
|
Michael Niedermayer
|
b1b58310d0
|
Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'
* commit '8d26c193fb42d08602ac93ece039d4718d029adc':
avdevice: Apply a more consistent file naming scheme
Conflicts:
libavdevice/Makefile
libavdevice/alsa.h
libavdevice/alsa_dec.c
libavdevice/alsa_enc.c
libavdevice/sndio_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2015-04-09 21:36:42 +02:00 |
Diego Biurrun
|
8d26c193fb
|
avdevice: Apply a more consistent file naming scheme
|
2015-04-09 16:40:12 +02:00 |