diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 04:29:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 04:29:58 +0200 |
| commit | 73e6af9d7b56f12d8676ff919f4acc6c9991d985 (patch) | |
| tree | 059e6a6f2697ddccb7554ffcf9d36dd0b421bb9d /libavformat/ffmdec.c | |
| parent | dbd94b771f1b1a90591e556edb65c91a34f994b6 (diff) | |
| parent | 17aa81d94781c6f62dc7d1dbd1f8891c020c9905 (diff) | |
| download | ffmpeg-73e6af9d7b56f12d8676ff919f4acc6c9991d985.tar.gz | |
Merge commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905'
* commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905':
hqx: Merge invalid format check within switch block
Conflicts:
libavcodec/hqx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ffmdec.c')
0 files changed, 0 insertions, 0 deletions