aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/smjpeg.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-08-07 09:54:12 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2015-08-07 09:54:12 +0200
commit8015150f43875531f05e31ac5021ea676fb20e40 (patch)
treea92d988815cb6efbd66a87b3b67e7240c76eb39f /libavformat/smjpeg.c
parent3d2d6728288fd6c00f119774ab2c86a6423813a5 (diff)
parent9469370fb32679352e66826daf77bdd2e6f067b5 (diff)
downloadffmpeg-8015150f43875531f05e31ac5021ea676fb20e40.tar.gz
Merge commit '9469370fb32679352e66826daf77bdd2e6f067b5'
* commit '9469370fb32679352e66826daf77bdd2e6f067b5': h264: Use AVERROR return codes instead of -1 Only partially merged, as the first hunk is not correct and would result in endless log spam. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/smjpeg.c')
0 files changed, 0 insertions, 0 deletions