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

Merge commit '93f29948e4b06acfb96e7f82d373ef86d6dc55f7'

Browse Source 
* commit '93f29948e4b06acfb96e7f82d373ef86d6dc55f7':
  mpeg4video: Fix doxygen comment syntax to document correct struct member

Conflicts:
	libavcodec/mpeg4video.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-14 12:50:40 +02:00
commit b634c12cb9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/mpeg4video.h
View File

@ -77,7 +77,7 @@ typedef struct Mpeg4DecContext {
int rvlc; int rvlc;
/// could this stream contain resync markers /// could this stream contain resync markers
int resync_marker; int resync_marker;
/// time distance of first I -> B, used for interlaced b frames /// time distance of first I -> B, used for interlaced B-frames
int t_frame; int t_frame;
int new_pred; int new_pred;
@ -85,7 +85,7 @@ typedef struct Mpeg4DecContext {
int scalability; int scalability;
int use_intra_dc_vlc; int use_intra_dc_vlc;
/// QP above whch the ac VLC should be used for intra dc /// QP above which the ac VLC should be used for intra dc
int intra_dc_threshold; int intra_dc_threshold;
/* bug workarounds */ /* bug workarounds */
@ -94,11 +94,11 @@ typedef struct Mpeg4DecContext {
int xvid_build; int xvid_build;
int lavc_build; int lavc_build;
/// flag for having shown the warning about divxs invalid b frames /// flag for having shown the warning about invalid Divx B-frames
int showed_packed_warning; int showed_packed_warning;
int vol_control_parameters; /**< does the stream contain the low_delay flag, /** does the stream contain the low_delay flag,
* used to work around buggy encoders. */ * used to work around buggy encoders. */
int vol_control_parameters;
int cplx_estimation_trash_i; int cplx_estimation_trash_i;
int cplx_estimation_trash_p; int cplx_estimation_trash_p;
int cplx_estimation_trash_b; int cplx_estimation_trash_b;