generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '15210354cf27cf4e24d91f84d66cf471511ce718'

Browse Source 
* commit '15210354cf27cf4e24d91f84d66cf471511ce718':
  h264: drop outdated comments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-02-14 14:06:54 +01:00
parent 99b12357f4 15210354cf
commit a7eb93b367
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@@ -3432,7 +3432,7 @@ int ff_set_ref_count(H264Context *h)
/** /**
* Decode a slice header. * 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 h h264context
* @param h0 h264 master context (differs from 'h' when doing sliced based * @param h0 h264 master context (differs from 'h' when doing sliced based

6
libavcodec/h264.h
View File

@@ -385,11 +385,7 @@ typedef struct H264Context {
unsigned current_sps_id; ///< id of the current SPS unsigned current_sps_id; ///< id of the current SPS
SPS sps; ///< current sps SPS sps; ///< current sps
PPS pps; ///< current pps
/**
* current pps
*/
PPS pps; // FIXME move to Picture perhaps? (->no) do we need that?
int au_pps_id; ///< pps_id of current access unit int au_pps_id; ///< pps_id of current access unit