diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-24 15:42:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-24 15:48:02 +0100 |
| commit | 9dbedf331eca9903230368f28716f29e7375450a (patch) | |
| tree | e74d461ecc2c8d5d58e8270e42e9391b89b3dd30 /libavformat/mpeg.c | |
| parent | ba8e909c825164a74a4fc580286200a9165e019c (diff) | |
| parent | c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b (diff) | |
Merge commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b'
* commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b':
yop: simplify/sanitize the decoding loop
c93: set palette_has_changed.
bmp: cosmetics, reformat
hlsenc: Don't duplicate a string constant
Conflicts:
libavcodec/bmp.c
tests/ref/fate/yop
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpeg.c')
0 files changed, 0 insertions, 0 deletions