summaryrefslogtreecommitdiff
path: root/Changelog
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-06 10:57:04 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-06 11:39:09 +0200
commit7cbef2ed7ed4f3ce31e6a405580e92fdfafc3448 (patch)
tree0d3d52781eddded7a49501bce8948f9bcf570b9b /Changelog
parent3fa72de82f04802e307085d3fce9eafea1d3dc46 (diff)
parent811bd0784679dfcb4ed02043a37c92f9df10500e (diff)
Merge commit '811bd0784679dfcb4ed02043a37c92f9df10500e'
* commit '811bd0784679dfcb4ed02043a37c92f9df10500e': avconv: make input -ss accurate when transcoding Conflicts: Changelog doc/ffmpeg.texi ffmpeg.h ffmpeg_filter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
-rw-r--r--Changelog3
1 files changed, 3 insertions, 0 deletions
diff --git a/Changelog b/Changelog
index 48f93c74a9..c507b954d3 100644
--- a/Changelog
+++ b/Changelog
@@ -8,6 +8,9 @@ version <next>
- ffprobe -show_programs option
- compand filter
- RTMP seek support
+- when transcoding with ffmpeg (i.e. not streamcopying), -ss is now accurate
+ even when used as an input option. Previous behavior can be restored with
+ the -noaccurate_seek option.
version 2.0: