diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-23 18:26:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-23 18:26:37 +0200 |
| commit | 4ca6a151e0c48f2729027ac263269cb50e88ed71 (patch) | |
| tree | 1307128caf78999abcf1600fd0fa8224770baa3b /libavcodec/vc1.h | |
| parent | 276f43be68617c0d56001abf1e213911dd51fed7 (diff) | |
| parent | bc8c50512fc8550ae80535390379e00937623e00 (diff) | |
| download | ffmpeg-4ca6a151e0c48f2729027ac263269cb50e88ed71.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: print the codecs names in the stream mapping.
avconv: move the avcodec_find_decoder() call to add_input_streams().
Windows Media Image decoder (WMVP/WVP2)
ac3enc: remove outdated TODO comment for apply_channel_coupling()
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/vc1dec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1.h')
| -rw-r--r-- | libavcodec/vc1.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h index 6d4c0aa7a3..b7ef557704 100644 --- a/libavcodec/vc1.h +++ b/libavcodec/vc1.h @@ -311,6 +311,9 @@ typedef struct VC1Context{ //@{ int new_sprite; int two_sprites; + AVFrame sprite_output_frame; + int output_width, output_height, sprite_width, sprite_height; + uint8_t* sr_rows[2][2]; ///< Sprite resizer line cache //@} int p_frame_skipped; |