summaryrefslogtreecommitdiff
path: root/ffmpeg.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-10 13:51:07 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-10 13:51:07 +0200
commitb7ebb49d035205bcfbcc4f1788df5ba1419fadc8 (patch)
treee4566b574da96ea49e59e3d5bc03ecbbde903f15 /ffmpeg.h
parenteb71f027f0581fd732fe33e559e38855f90da66f (diff)
parentfb722a900fc5cc9e003b9fef25b27ed7fc5547a2 (diff)
downloadffmpeg-b7ebb49d035205bcfbcc4f1788df5ba1419fadc8.tar.gz
Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'
* commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2': avconv: remove -same_quant Conflicts: Changelog doc/faq.texi ffmpeg.c ffmpeg.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
-rw-r--r--ffmpeg.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/ffmpeg.h b/ffmpeg.h
index 6494c7394a..047029d444 100644
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -301,7 +301,6 @@ typedef struct OutputStream {
int top_field_first;
float frame_aspect_ratio;
- float last_quality;
/* forced key frames */
int64_t *forced_kf_pts;
@@ -377,7 +376,6 @@ extern int debug_ts;
extern int exit_on_error;
extern int print_stats;
extern int qp_hist;
-extern int same_quant;
extern int stdin_interaction;
extern int frame_bits_per_raw_sample;
extern AVIOContext *progress_avio;