diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 15:51:07 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 15:51:07 +0400 |
| commit | b7ebb49d035205bcfbcc4f1788df5ba1419fadc8 (patch) | |
| tree | e4566b574da96ea49e59e3d5bc03ecbbde903f15 /Changelog | |
| parent | eb71f027f0581fd732fe33e559e38855f90da66f (diff) | |
| parent | fb722a900fc5cc9e003b9fef25b27ed7fc5547a2 (diff) | |
Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'
* commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2':
avconv: remove -same_quant
Conflicts:
Changelog
doc/faq.texi
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
| -rw-r--r-- | Changelog | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -10,6 +10,7 @@ version next: - Pinnacle TARGA CineWave YUV16 decoder - TAK demuxer, decoder and parser - DTS-HD demuxer +- remove -same_quant, it hasn't worked for years version 1.0: |