diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-24 15:29:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-24 15:29:15 +0100 |
| commit | ba8e909c825164a74a4fc580286200a9165e019c (patch) | |
| tree | 8593a7a5d08917fdef2dfdf3b6799d561bb2f8a9 /libavcodec | |
| parent | d69238e991844cb0e9407c26e64dd7a551aa5bab (diff) | |
| parent | 3193b13aa1e271f6d2dd68de67d448c08aef3c00 (diff) | |
| download | ffmpeg-ba8e909c825164a74a4fc580286200a9165e019c.tar.gz | |
Merge commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00'
* commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00':
hlsenc: Allocate enough space for the pattern string
lavc: Correct the description of pkt_dts
avfilter: Compile FIFO filters unconditionally
Conflicts:
libavcodec/avcodec.h
libavfilter/Makefile
libavfilter/allfilters.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 4c7ac2458f..11c50cacbf 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1200,7 +1200,7 @@ typedef struct AVFrame { int64_t pkt_pts; /** - * dts from the last AVPacket that has been input into the decoder + * dts copied from the AVPacket that triggered returning this frame * - encoding: unused * - decoding: Read by user. */ |