diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-18 11:50:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-18 12:00:17 +0200 |
| commit | 66722b4ba955eebef77045644a082505cfa134fa (patch) | |
| tree | 30cd0c4af5bbca39a51c48a3038d96c13ca28d9e /libavcodec/libgsm.c | |
| parent | 338f8b2eaf36f078eb5cc26ac10e651dc4c48243 (diff) | |
| parent | c34a96a5ddfa390ce2a352eca79190766c9056d4 (diff) | |
| download | ffmpeg-66722b4ba955eebef77045644a082505cfa134fa.tar.gz | |
Merge commit 'c34a96a5ddfa390ce2a352eca79190766c9056d4'
* commit 'c34a96a5ddfa390ce2a352eca79190766c9056d4':
dxa: fix decoding of first I-frame by separating I/P-frame decoding
Conflicts:
libavcodec/dxa.c
See: 186e47ef6d7d90bfd8b16e77cfa5e7aeb2a497c0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libgsm.c')
0 files changed, 0 insertions, 0 deletions