diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-25 20:48:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-25 21:06:14 +0200 |
| commit | c0b47d1914a19abacdf1edf081cbf07485952920 (patch) | |
| tree | 94b26fadd3ecf4352ff87bd807ea6124bc2f4c02 /ffmpeg.c | |
| parent | e02e58fb1c108dd96ef5b61454a2ba8d2af895ea (diff) | |
| parent | ed7bdd8647a3d0f534c2af0d244fc8744ff262a0 (diff) | |
| download | ffmpeg-n0.12-dev.tar.gz | |
Merge remote-tracking branch 'qatar/master'n0.12-dev
* qatar/master:
movenc: Don't write the 'wave' atom or its child 'enda' for lpcm audio.
imc: some cosmetics
rtmp: Pass the proper return code in rtmp_handshake
rtmp: Check return codes of net IO operations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions