diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 12:31:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 12:31:29 +0200 |
| commit | 6afd726b7b279cac09d8a8eb6d5529ac2425a996 (patch) | |
| tree | 3b1e248205c43e93cb63878bd8008f5feda43392 /libavcodec/h261_parser.c | |
| parent | 1e81b185ae722b5ba93a8615615241a07b3b28ee (diff) | |
| parent | 6baeadd11083774ebd823dd5e1a744c2150a3bfc (diff) | |
| download | ffmpeg-6afd726b7b279cac09d8a8eb6d5529ac2425a996.tar.gz | |
Merge commit '6baeadd11083774ebd823dd5e1a744c2150a3bfc'
* commit '6baeadd11083774ebd823dd5e1a744c2150a3bfc':
w32pthreads: Mark functions in compatibility wrapper as av_unused
Conflicts:
compat/w32pthreads.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h261_parser.c')
0 files changed, 0 insertions, 0 deletions