aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-04 20:21:01 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-04 20:21:05 +0200
commit6a0f9f27d576824fdf699dda1c9e985b9fada44d (patch)
treec42e3edbbb163a1afd1884f502096b8255ae0324 /libavcodec
parent0efe3be71d94a094b2de6ae151309ab875a5463e (diff)
parent7738f925a6424d3bb39a92927881e75068bdcfba (diff)
downloadffmpeg-6a0f9f27d576824fdf699dda1c9e985b9fada44d.tar.gz
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master: Fix rc_max_rate documentation. Fix some fate filter tests with --target-path. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/avcodec.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index d1f67bbf70..4e02f046cd 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2290,7 +2290,7 @@ typedef struct AVCodecContext {
/**
* maximum bitrate
* - encoding: Set by user.
- * - decoding: unused
+ * - decoding: Set by libavcodec.
*/
int rc_max_rate;