Merge commit '98cec5c8'

* commit '98cec5c8':
  ratecontrol: remove an unused variable
  vorbisdec: do not leak the first frame.
  vf_pad: fix a & instead of && typo

Conflicts:
	libavfilter/vf_pad.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/ratecontrol.h

@@ -61,7 +61,6 @@ typedef struct RateControlEntry{
  * rate control context.
  */
 typedef struct RateControlContext{
-    FILE *stats_file;
     int num_entries;              ///< number of RateControlEntries
     RateControlEntry *entry;
     double buffer_index;          ///< amount of bits in the video/audio buffer