diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-03 13:17:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-03 13:44:44 +0200 |
| commit | 8ba683e629bd44f5c222ff8fe9cfdc101177dc0f (patch) | |
| tree | 41d00f799cc67751e1c7ccaf03e3b4f5938a2212 /libavcodec/pnm.h | |
| parent | 92b7e7b31817cd470c38f84bac2053cd565ae521 (diff) | |
| parent | 8aba7968dd604aae91ee42cbce0be3dad7dceb30 (diff) | |
| download | ffmpeg-8ba683e629bd44f5c222ff8fe9cfdc101177dc0f.tar.gz | |
Merge commit '8aba7968dd604aae91ee42cbce0be3dad7dceb30'
* commit '8aba7968dd604aae91ee42cbce0be3dad7dceb30':
vcr1: add sanity checks
Conflicts:
libavcodec/vcr1.c
See: 845724c82c1a732ab398c9e8cedd178f96f1626d
See: 8e09482e4d27d65bbce2ce5c2f4392216011ed09
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pnm.h')
0 files changed, 0 insertions, 0 deletions