diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 18:58:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 19:37:53 +0100 |
| commit | 7a901eb33af6a079d0ce4045c64eda858884f861 (patch) | |
| tree | 8866db461e8256270efc602429f4a79265272f51 /libavcodec/sipr16kdata.h | |
| parent | 58f70f17017ec586a50f1fea4a744cbd11f74796 (diff) | |
| parent | 37a749012aaacc801fe860428417a6d7b81c103f (diff) | |
| download | ffmpeg-7a901eb33af6a079d0ce4045c64eda858884f861.tar.gz | |
Merge commit '37a749012aaacc801fe860428417a6d7b81c103f'
* commit '37a749012aaacc801fe860428417a6d7b81c103f':
lavc: rework handling of refcounted_frames=0
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sipr16kdata.h')
0 files changed, 0 insertions, 0 deletions