diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-10 04:27:10 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-10 04:27:10 +0400 |
| commit | 78ac7ee97040a2e9a69b81f82a89edd779e124bb (patch) | |
| tree | bae6d10aa246d91b094bf2754efcb944049c7c46 /libavcodec/mpegvideo.h | |
| parent | 5c75708cf08d57ed4f9744201554d276c8d5c2e9 (diff) | |
| parent | 5d471b73d20616f5ac701ff62e5de49465cda264 (diff) | |
Merge commit '5d471b73d20616f5ac701ff62e5de49465cda264'
* commit '5d471b73d20616f5ac701ff62e5de49465cda264':
rtpdec: K&R formatting and spelling cosmetics
cosmetics: Fix dropable --> droppable typo
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index b366899930..1bdead56eb 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -346,7 +346,7 @@ typedef struct MpegEncContext { int vbv_delay; int last_pict_type; //FIXME removes int last_non_b_pict_type; ///< used for mpeg4 gmc b-frames & ratecontrol - int dropable; + int droppable; int frame_rate_index; AVRational mpeg2_frame_rate_ext; int last_lambda_for[5]; ///< last lambda for a specific pict type |