diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-29 13:15:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-29 13:15:27 +0100 |
| commit | 67420b3de50202c0c71e3c9a57451b4adbcb16ab (patch) | |
| tree | f7be2c59620ee2cc598467de8155ebb7ceab0bdf /libavdevice/alsa-audio-enc.c | |
| parent | 7d1e003abddf18ba43be359c4d3b6194f9f2fbca (diff) | |
| parent | f174fbac3cb127273b8f3df8e05d7156ec1d7658 (diff) | |
| download | ffmpeg-67420b3de50202c0c71e3c9a57451b4adbcb16ab.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: add CODEC_CAP_DR1 to all video decoders missing them
rtpdec: Cosmetic cleanup
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/alsa-audio-enc.c')
0 files changed, 0 insertions, 0 deletions