diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-08 08:07:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-08 08:07:05 +0100 |
| commit | bc17a6f5c012522186592fcbc3acaa7701c4b208 (patch) | |
| tree | 39f9098fca3f6fff152298bc819078428694cf22 /libavformat/rtmpproto.c | |
| parent | 78e08fd340e03b49f75e1ac31c20cc21434794bd (diff) | |
| parent | 12776d5d2a46363c52603ae2be888a3094fce1c6 (diff) | |
| download | ffmpeg-bc17a6f5c012522186592fcbc3acaa7701c4b208.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libvpxenc: Allow enabling constrained quality (CQ) mode
Conflicts:
configure
libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmpproto.c')
0 files changed, 0 insertions, 0 deletions