Merge commit '79f5347a983342e2711ca8ba19ec3d8d151183f0'

* commit '79f5347a983342e2711ca8ba19ec3d8d151183f0': avcodec: fix doxy placement Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
10 years ago · b33d58c31f
parent 611c22140a 79f5347a98
commit b33d58c31f
1 changed files with 2 additions and 2 deletions
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@ -789,11 +789,11 @@ typedef struct RcOverride{
 * interlaced motion estimation
 */
 #define AV_CODEC_FLAG_INTERLACED_ME   (1 << 29)
 #define AV_CODEC_FLAG_CLOSED_GOP      (1U << 31)
 /**
 * Allow non spec compliant speedup tricks.
 */
 #define AV_CODEC_FLAG_CLOSED_GOP      (1U << 31)
 #define AV_CODEC_FLAG2_FAST           (1 <<  0)
 /**
 * Skip bitstream encoding.