RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2013-03-13 01:47:39 +01:00
parent 02a6b06d9e 98cec5c84f
commit 047c5e177a
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/ratecontrol.h
View File

@ -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