diff options
| author | Michael Niedermayer <[email protected]> | 2014-11-13 14:21:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-11-13 14:21:58 +0100 |
| commit | ecb748866e00841e2e00e2c9c3438391a9e9e760 (patch) | |
| tree | 086ef75be3e04308b0b6fd6061a25189b0322a6b /libpostproc/postprocess.c | |
| parent | 785f71fcd508113a4717bd6efcb2e0545b1c2e66 (diff) | |
| parent | 8e104619a627fcf5f4c2bd3c09d0c2d323aae745 (diff) | |
Merge commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745'
* commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745':
shorten: check for return value
Conflicts:
libavcodec/shorten.c
See: e20ebe491c17388a312e04ff060c217ecfafc914
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libpostproc/postprocess.c')
0 files changed, 0 insertions, 0 deletions