diff options
| author | Michael Niedermayer <[email protected]> | 2013-02-06 15:21:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-02-06 15:21:39 +0100 |
| commit | a845ac78c9428d6fd0f9f4f61a34ac816e3dedfa (patch) | |
| tree | 071d4b4757b5b9abcfe05857f7e9c50aee88b43a /libavcodec/tak_parser.c | |
| parent | ddc3ca2caa4a78f0e6824d0d19bc98cfd955b333 (diff) | |
| parent | 2cd4068071b9a8908823a3107f97e938211045ce (diff) | |
Merge commit '2cd4068071b9a8908823a3107f97e938211045ce'
* commit '2cd4068071b9a8908823a3107f97e938211045ce':
fraps: fix off-by one bug for version 1.
Conflicts:
libavcodec/fraps.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/tak_parser.c')
0 files changed, 0 insertions, 0 deletions