OSDN Git Service

Merge commit '50c449ac24fbb4c03c15d2e2026cef2204b80385'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Mar 2013 16:30:53 +0000 (17:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Mar 2013 16:30:53 +0000 (17:30 +0100)
commit523c8e0503dcf99f67ea909dea2ca5e56d9ff091
tree1b9a5e34ff578050ac2818ede280be7dbd3be612
parent6abb554fd698d43726302b68999b96f429c7d3ba
parent50c449ac24fbb4c03c15d2e2026cef2204b80385
Merge commit '50c449ac24fbb4c03c15d2e2026cef2204b80385'

* commit '50c449ac24fbb4c03c15d2e2026cef2204b80385':
  iff: validate CMAP palette size
  asfenc: return error on negative timestamp

Conflicts:
libavformat/iff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/asfenc.c
libavformat/iff.c