Merge commit '98cec5c84feff34e04428de4a86836a83657ae5e'

* commit '98cec5c84feff34e04428de4a86836a83657ae5e':
  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>
pull/12/merge
Michael Niedermayer 12 years ago
commit 047c5e177a
  1. 1
      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

Loading…
Cancel
Save