repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
ffmpeg.h
diff --git
a/ffmpeg/ffmpeg.h
b/ffmpeg/ffmpeg.h
index 56eb66a6e85c674e9e947918e558fbfd61de88e3..117a35ce87515fb6488dbde85a9a85173fe09c5a 100644
(file)
--- a/
ffmpeg/ffmpeg.h
+++ b/
ffmpeg/ffmpeg.h
@@
-388,6
+388,8
@@
typedef struct OutputStream {
AVCodec *enc;
int64_t max_frames;
AVFrame *filtered_frame;
AVCodec *enc;
int64_t max_frames;
AVFrame *filtered_frame;
+ AVFrame *last_frame;
+ int last_droped;
/* video only */
AVRational frame_rate;
/* video only */
AVRational frame_rate;
@@
-420,6
+422,7
@@
typedef struct OutputStream {
AVDictionary *encoder_opts;
AVDictionary *swr_opts;
AVDictionary *resample_opts;
AVDictionary *encoder_opts;
AVDictionary *swr_opts;
AVDictionary *resample_opts;
+ AVDictionary *bsf_args;
char *apad;
OSTFinished finished; /* no more packets should be written for this stream */
int unavailable; /* true if the steram is unavailable (possibly temporarily) */
char *apad;
OSTFinished finished; /* no more packets should be written for this stream */
int unavailable; /* true if the steram is unavailable (possibly temporarily) */
@@
-481,6
+484,7
@@
extern int do_deinterlace;
extern int do_hex_dump;
extern int do_pkt_dump;
extern int copy_ts;
extern int do_hex_dump;
extern int do_pkt_dump;
extern int copy_ts;
+extern int start_at_zero;
extern int copy_tb;
extern int debug_ts;
extern int exit_on_error;
extern int copy_tb;
extern int debug_ts;
extern int exit_on_error;
@@
-490,6
+494,7
@@
extern int stdin_interaction;
extern int frame_bits_per_raw_sample;
extern AVIOContext *progress_avio;
extern float max_error_rate;
extern int frame_bits_per_raw_sample;
extern AVIOContext *progress_avio;
extern float max_error_rate;
+extern int vdpau_api_ver;
extern const AVIOInterruptCB int_cb;
extern const AVIOInterruptCB int_cb;