diff options
| author | Michael Niedermayer <[email protected]> | 2015-07-21 00:54:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-07-21 00:54:42 +0200 |
| commit | e5bae39f46e55843c025d280ed5441e358e59f2e (patch) | |
| tree | e2de68b736efbb95d8e83a99fdfccf7a948b62f4 /cmdutils.c | |
| parent | b1fad7ac200d0779a44fc267085d7d46ce2391b9 (diff) | |
| parent | 5d3addb937946eca5391e40b5e6308e74ac6f77b (diff) | |
Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b'
* commit '5d3addb937946eca5391e40b5e6308e74ac6f77b':
Add a quality factor packet side data
Conflicts:
doc/APIchanges
ffmpeg.c
libavcodec/avcodec.h
libavcodec/mpegvideo_enc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions