aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/librtmp.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-08 12:47:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-08 12:47:54 +0200
commit9818bbde5303f3618c6f428a3ab75ae916821a5d (patch)
tree66e7cc65a9ab114f579f9117235c3dc26481893d /libavformat/librtmp.c
parent1aed0513a1c2fdc3b94c9dd165d393bd5513b92a (diff)
parente0c53c3408181d2e7d544eb65fc7355a79438dfe (diff)
downloadffmpeg-9818bbde5303f3618c6f428a3ab75ae916821a5d.tar.gz
Merge commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe'
* commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe': nut: use meaningful error values FATE: use a less ambiguous end time for filter-trim-time test Conflicts: libavformat/nutdec.c tests/fate/filter-video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/librtmp.c')
0 files changed, 0 insertions, 0 deletions