diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-23 14:36:47 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-23 14:53:21 +0100 |
commit | def18e5470bdcddb9d737784cc6ae427c195da7c (patch) | |
tree | 1fbf600ae18a94ff1c87e4c8512e2e708b6f3c24 /libavcodec/avcodec.h | |
parent | 2f9903f66220b3f175c66e8543ff6066beaa7c66 (diff) | |
parent | b047c68783aa4042b322af7af043b643d5daf09c (diff) | |
download | ffmpeg-streaming-def18e5470bdcddb9d737784cc6ae427c195da7c.zip ffmpeg-streaming-def18e5470bdcddb9d737784cc6ae427c195da7c.tar.gz |
Merge commit 'b047c68783aa4042b322af7af043b643d5daf09c'
* commit 'b047c68783aa4042b322af7af043b643d5daf09c':
4xm: don't rely on get_buffer() initializing the frame.
huffyuv: split encoder and decoder into separate files.
lavc: make pkt_{p,d}ts doxy less confusing
Conflicts:
libavcodec/Makefile
libavcodec/huffyuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
-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 9ee9af1..4c7ac24 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1193,7 +1193,7 @@ typedef struct AVFrame { int64_t pts; /** - * reordered pts from the last AVPacket that has been input into the decoder + * pts copied from the AVPacket that was decoded to produce this frame * - encoding: unused * - decoding: Read by user. */ |