diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-29 00:20:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-29 00:20:29 +0100 |
| commit | 4dcd1a3145dd93602b86a44ebc07d98ca2a30ab6 (patch) | |
| tree | 694f5d2cba955bc53de20f8fb81cb54439ae5279 /libavutil/timer.h | |
| parent | 4b03d960220d15cb915c2c8f15970d2f36f25cd9 (diff) | |
| parent | ac47e014bbaf5163871a8beb7522015e0bc27615 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
adtsenc: Check frame size.
txd: Fix order of operations.
APIchanges: fill in some blanks
timer: fix misspelling of "decicycles"
Eliminate pointless 0/NULL initializers in AVCodec and similar declarations.
indeo3: cosmetics
md5proto: Fix order of operations.
dca: Replace oversized unused get_bits() with skip_bits_long().
Conflicts:
doc/APIchanges
libavformat/mmsh.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/timer.h')
| -rw-r--r-- | libavutil/timer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/timer.h b/libavutil/timer.h index 8a0cad56ca..63576c95bf 100644 --- a/libavutil/timer.h +++ b/libavutil/timer.h @@ -61,7 +61,7 @@ tend= AV_READ_TIME();\ }else\ tskip_count++;\ if(((tcount+tskip_count)&(tcount+tskip_count-1))==0){\ - av_log(NULL, AV_LOG_ERROR, "%"PRIu64" dezicycles in %s, %d runs, %d skips\n",\ + av_log(NULL, AV_LOG_ERROR, "%"PRIu64" decicycles in %s, %d runs, %d skips\n",\ tsum*10/tcount, id, tcount, tskip_count);\ }\ } |