diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 00:34:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 00:39:51 +0100 |
| commit | 3cf1503beb35203ef4b9ddef5a2bc8b6f919eb12 (patch) | |
| tree | eb027b9ab20bb5dd6b89a1ca4eeab99ab600ec4d /libavcodec/wma.h | |
| parent | 532b93b51631ee58443bee8aec7c2a2b2a1746be (diff) | |
| parent | a6a2282c25abe43e352010a7c3fbc92994c0bc1c (diff) | |
| download | ffmpeg-3cf1503beb35203ef4b9ddef5a2bc8b6f919eb12.tar.gz | |
Merge commit 'a6a2282c25abe43e352010a7c3fbc92994c0bc1c'
* commit 'a6a2282c25abe43e352010a7c3fbc92994c0bc1c':
rv30: fix extradata size check.
Conflicts:
libavcodec/rv30.c
See: 09c5f990bc7629dfbee8c760fd485936c60a7b40
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wma.h')
0 files changed, 0 insertions, 0 deletions