Merge commit 'ff300e43'

* commit 'ff300e43':
  mpegvideo: remove an unused variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/mpegvideo.h

@@ -655,7 +655,6 @@ typedef struct MpegEncContext {
     /* Mpeg1 specific */
     int gop_picture_number;  ///< index of the first picture of a GOP based on fake_pic_num & mpeg1 specific
     int last_mv_dir;         ///< last mv_dir, used for b frame encoding
-    int broken_link;         ///< no_output_of_prior_pics_flag
     uint8_t *vbv_delay_ptr;  ///< pointer to vbv_delay in the bitstream
 
     /* MPEG-2-specific - I wished not to have to support this mess. */