diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 14:06:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 14:07:19 +0100 |
| commit | a7eb93b3671f62a578ce295e792a955a30e8e7a5 (patch) | |
| tree | 51901b586e8c283d4018b13e7ce74423abd9ba5e /libavcodec | |
| parent | 99b12357f47efd7da070e29d888e9e7646824667 (diff) | |
| parent | 15210354cf27cf4e24d91f84d66cf471511ce718 (diff) | |
Merge commit '15210354cf27cf4e24d91f84d66cf471511ce718'
* commit '15210354cf27cf4e24d91f84d66cf471511ce718':
h264: drop outdated comments
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 2 | ||||
| -rw-r--r-- | libavcodec/h264.h | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 37a85889f1..cf4aa44315 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3432,7 +3432,7 @@ int ff_set_ref_count(H264Context *h) /** * Decode a slice header. - * This will also call ff_MPV_common_init() and frame_start() as needed. + * This will (re)intialize the decoder and call h264_frame_start() as needed. * * @param h h264context * @param h0 h264 master context (differs from 'h' when doing sliced based diff --git a/libavcodec/h264.h b/libavcodec/h264.h index eccce5a69b..a744ac2647 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -385,11 +385,7 @@ typedef struct H264Context { unsigned current_sps_id; ///< id of the current SPS SPS sps; ///< current sps - - /** - * current pps - */ - PPS pps; // FIXME move to Picture perhaps? (->no) do we need that? + PPS pps; ///< current pps int au_pps_id; ///< pps_id of current access unit |