diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 01:47:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 01:47:39 +0100 |
| commit | 047c5e177ae0cffdb1f3648a31a96784d2cf94c0 (patch) | |
| tree | 49932da490caa2da69ff904c25991f151c1b029c | |
| parent | 02a6b06d9ea0009f058b0f43c98f640f63f1359a (diff) | |
| parent | 98cec5c84feff34e04428de4a86836a83657ae5e (diff) | |
| download | ffmpeg-047c5e177ae0cffdb1f3648a31a96784d2cf94c0.tar.gz | |
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>
| -rw-r--r-- | libavcodec/ratecontrol.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/ratecontrol.h b/libavcodec/ratecontrol.h index b4132bfcb6..959b6a2353 100644 --- a/libavcodec/ratecontrol.h +++ b/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 |