diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-07-23 12:46:11 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-07-23 12:46:11 -0700 |
| commit | 5dcb2e3237bb46ba36867eeb2f9e1d4795c571b4 (patch) | |
| tree | 4963e5aba4a99e514d6b4987f83a6b3ad113792b /vp9 | |
| parent | 66d5757695fd3e66a20941759b47d88189fafdb5 (diff) | |
| parent | bcaf1d69ec8ba4a616464aeb7b58ec92b76cc42a (diff) | |
| download | libvpx-5dcb2e3237bb46ba36867eeb2f9e1d4795c571b4.tar libvpx-5dcb2e3237bb46ba36867eeb2f9e1d4795c571b4.tar.gz libvpx-5dcb2e3237bb46ba36867eeb2f9e1d4795c571b4.tar.bz2 libvpx-5dcb2e3237bb46ba36867eeb2f9e1d4795c571b4.zip | |
Merge "Moved call to vp9_clear_system_state() to a proper location"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 5c5d99408..b1a5e0888 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -2685,6 +2685,9 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags, cpi->last_end_time_stamp_seen = cpi->source->ts_start; } + // Clear down mmx registers + vp9_clear_system_state(); + // adjust frame rates based on timestamps given if (cm->show_frame) { adjust_frame_rate(cpi); @@ -2699,9 +2702,6 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags, // start with a 0 size frame *size = 0; - // Clear down mmx registers - vp9_clear_system_state(); - /* find a free buffer for the new frame, releasing the reference previously * held. */ |