aboutsummaryrefslogtreecommitdiffstats
path: root/tests/ref/fate/sgi-rgb48
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-19 12:57:32 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-19 12:59:05 +0200
commit247f4d1f181c2801b8321a7ddb88818dc4861155 (patch)
tree37592f29866ffba276115808a1c896bc2c4e7bf2 /tests/ref/fate/sgi-rgb48
parentdb3e12a828553171f37c98119679316720e4caed (diff)
parent6d5d9246042acb804a652e6fedfb7afe0ca85614 (diff)
downloadffmpeg-247f4d1f181c2801b8321a7ddb88818dc4861155.tar.gz
Merge commit '6d5d9246042acb804a652e6fedfb7afe0ca85614'
* commit '6d5d9246042acb804a652e6fedfb7afe0ca85614': avconv: move handling the 2pass logfile into avconv_opt Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'tests/ref/fate/sgi-rgb48')
0 files changed, 0 insertions, 0 deletions