summaryrefslogtreecommitdiff
path: root/doc/ffmpeg.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-30 21:08:45 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-03-30 21:11:01 +0200
commitf22d9b1e0b63ef25ba62c06e2ebf55a76614da67 (patch)
tree563905a2848bb71198462013d3dfd893361da477 /doc/ffmpeg.texi
parentce0ec108cd34a941c9f00a6a3d091588d274f4be (diff)
parent68e95ab81be1aa3f47ab148dceb8711ef5f4212d (diff)
Merge commit '68e95ab81be1aa3f47ab148dceb8711ef5f4212d'
* commit '68e95ab81be1aa3f47ab148dceb8711ef5f4212d': dnxhdenc: return meaningful return codes Conflicts: libavcodec/dnxhdenc.c See: b9bedb0b287d3aaa30540d18fdb87b2cc98ca339 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffmpeg.texi')
0 files changed, 0 insertions, 0 deletions