Merge commit '98cec5c84f'
* commit '98cec5c84f':
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>
This commit is contained in:
commit
047c5e177a
1 changed files with 0 additions and 1 deletions
|
|
@ -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…
Add table
Add a link
Reference in a new issue