diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-19 00:53:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-19 00:53:42 +0200 |
| commit | ba57ef29723e11e94f2d5a07d4f384e636316c16 (patch) | |
| tree | 469c52643fe98b6efe791d6caaecfb707ef2bd8f /libavformat/librtmp.c | |
| parent | 8ea6157d83277a089137fb8113174bc4e7a8ffd2 (diff) | |
| parent | bb337b4fbceb6af7f70ef2f9476733cc2fa5350b (diff) | |
| download | ffmpeg-ba57ef29723e11e94f2d5a07d4f384e636316c16.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: Fix spelling errors.
aac: Only set sample rate and object type from ADTS if output hasn't been configured.
aac: Set SBR and PS to unsignalled during headerless and ADTS initialization.
aac: Only output configure if audio was found.
avconv: save two levels of indentation in flush_encoders()
avconv: factor flushing encoders out of output_packet().
avconv: factor out initializing input streams.
avconv: remove -intra option.
avconv: reset streamid_map between output files.
avconv: make timer_start a local var in transcode().
avconv: cosmetics, move OutputStream.
avconv: remove two unused macros.
Conflicts:
avconv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/librtmp.c')
0 files changed, 0 insertions, 0 deletions